Re: how to keeping track of cherry-pick?

[Junio C Hamano <gitster@pobox.com>]

Knut Olav Bøhmer <knut-olav.bohmer@telenor.com> writes:

> 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"

I think you are looking at it a wrong way.

Because subversion (at least the older one) does not keep track of merges,
you had to track cherry-picks.  But cherry-pick is not how you usually do
things in git.  You keep many topic branches with different doneness, and
you merge well-cooked ones to the more stable integration branch while
leaving others still cooking.  So what you want to know is not cherry-pick
status, but merge status.

Because git tracks merges, output from "git log master..$topic" gives all
you need to know about $topic.  The command lists changes that are still
not merged to master on the $topic branch.  If it is empty, $topic is
already merged fully to master.  Otherwise you still have things to
merge.

To get a list of topics that have been merged (or not merged) to a
particular integration branch, you should be able to use "git branch" with
its --merged and --no-merged options.  This does not list what commits
each yet-to-be-merged topics have, though.