AMDG On 1/30/2011 7:06 AM, Vladimir Prus wrote:
Dave Abrahams wrote:
At Sun, 30 Jan 2011 16:43:17 +0300, Vladimir Prus wrote:
2. Because 'git cherry-pick' is fundamentally unable to record any mergeinfo, this means that any time you want to merge a single specific fix to release branch, you would have problems.
What release branch? Who said anything about cherry-pick? What problems?
Suppose you have library X with 200 new changes. For next release, it is necessary to include one of those changes. How do you do that? With current release process, it's a single command (obviously, run by a single person).
And regardless, SVN has all the same issues w.r.t. picking individual changes, doesn't it?
No. When you merge a single revision from branch A to branch B, SVN records accurate information about this merge. When you do 'git cherry-pick', git does not record any information whatsoever and is fundementally unable to record it.
I cherry-pick changesets to merge to the release branch on a pretty regular basis and it works fine with svn. If git really doesn't support this well, you can count me as strongly against switching. In Christ, Steven Watanabe