On Wed, Oct 17, 2012 at 07:12:17PM +0200, Stefan Sperling wrote: > You then cherry-picked this revision from prj1 into prj2, causing a commit > that added second.txt to prj2. Let's call this changeset 'prj2@50': > > A second.txt (copied from, say, prj1@49) > Mergeinfo addition: Merged prj1:40-49 > > Now you merge prj1 into testing, let's say in r61. The common ancestor of > testing and prj1 is trunk, which does not contain second.txt. > So among other changes you are merging: > > A second.txt (copied from, say, prj1@60) > Mergeinfo addition: Merged prj1:40-60 > > Next, you merge prj2 into testing, let's say in r71. The common ancestor > of prj2 and testing is trunk, which does not contain second.txt. > So the changeset being merged looks something like this: > > A second.txt (copied from, say, prj2@70) > Mergeinfo addition: Merged prj1:61-70
I got the above mergeinfo change wrong, of course :) The incoming mergeinfo change for prj1 isn't prj1:61-70 but prj1:40-49, which is a subset of prj1:40-60 already merged into testing. So it is a no-op change. > Mergeinfo addition: Merged prj2:50-70
