From: Andrew Sayers <andrew-git@pileofstuff.org>
To: Nick Douma <n.douma@nekoconeko.nl>
Cc: git@vger.kernel.org
Subject: Re: Migrating SVN to Git, and preserve merge information
Date: Wed, 11 Apr 2012 18:58:31 +0100 [thread overview]
Message-ID: <4F85C647.9070302@pileofstuff.org> (raw)
In-Reply-To: <4F8531B3.9030501@nekoconeko.nl>
Thanks Nick for the outline - the main thing I take from this is that
"unmerge" is used in real world revision messages, so it's important for
me to test that any regexp does the right thing there.
It sounds like grafts aren't the right solution for your problem. I
can't really suggest much without a better understanding of what you're
trying to achieve, but you might be interested in `git cherry`, which
tries to detect cherry-picked commits by comparing the diffs.
- Andrew
prev parent reply other threads:[~2012-04-11 17:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 15:18 Migrating SVN to Git, and preserve merge information Nick Douma
2012-04-10 22:57 ` Andrew Sayers
2012-04-11 7:24 ` Nick Douma
2012-04-11 11:13 ` Santi Béjar
2012-04-11 17:58 ` Andrew Sayers [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F85C647.9070302@pileofstuff.org \
--to=andrew-git@pileofstuff.org \
--cc=git@vger.kernel.org \
--cc=n.douma@nekoconeko.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).