Junio C Hamano wrote: > Knut Olav Bøhmer <knut-olav.bohmer@xxxxxxxxxxx> 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. I was afraid I would get this answer. I know that you change your workflow when you migrate to git, but I was looking for a way to resolve the situation we are in, due to our old vcs. -- Knut Olav Bøhmer -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
