From: "Knut Olav Bøhmer" <knut-olav.bohmer@telenor.com>
To: git@vger.kernel.org
Subject: how to keeping track of cherry-pick?
Date: Wed, 21 Jan 2009 00:53:08 +0100 [thread overview]
Message-ID: <497663E4.4000302@telenor.com> (raw)
Hi,
We are changing from subversion to git. We used to merge revisions from
development branch to stable with svnmerge.py.
svnmerge.py can give us a list of revisions available for merging. The
result is similar to "git log --chery-pick master..dev" The difference
is that svnmerge.py operates on revision-numbers, and --chery-pick looks
at the diffs. The result of that is that when we get a conflict when a
patch is cherry-picked, it will still show up as "available" when I run
"git log --cherry-pick master..dev"
svnmerge.py can also mark revisions as blocked, and will not show up in
the list of available revisions.
How can I keep track of cherry-picked patches, and mark patches as
"blocked", in the same (or similar) way as I did in subversion with
svnmerge.py?
--
Knut Olav Bøhmer
next reply other threads:[~2009-01-21 0:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-20 23:53 Knut Olav Bøhmer [this message]
2009-01-21 1:29 ` how to keeping track of cherry-pick? Junio C Hamano
2009-01-21 8:44 ` Knut Olav Bøhmer
2009-01-21 9:13 ` Michael J Gruber
2009-01-21 9:47 ` Junio C Hamano
2009-01-21 12:04 ` Johannes Schindelin
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=497663E4.4000302@telenor.com \
--to=knut-olav.bohmer@telenor.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.