On Mon, Sep 12, 2011 at 10:00 AM, Mark Phippard <markp...@gmail.com> wrote: > On Mon, Sep 12, 2011 at 9:50 AM, Julian Foad <julian.f...@wandisco.com> wrote: >>> If merge brought in legitimate >>> > changes to the svn:mergeinfo property. diff is supposed to show the >>> > changes, and those are changes. >> >> I said this is a choice, and that if we want to display raw changes to >> the property then that is a valid alternative but then we shouldn't be >> using the terminology "Merged: xxx" to describe the change when "xxx" >> was not in fact merged. >> >> Certainly the trivial way to close this "issue" is just to change the >> wording of the currently displayed messages. > > I think this is where we differ. > > Suppose you merge some changes from /branch1 to /branch2 and commit in r100. > > Now you merge r100 into /branch3. > > The mergeinfo from this merge will indicate that you merged r100 from > /branch2 but it will also contain the mergeinfo from the merge of > branch1 into branch2. I think this is correct and worth showing in > the diff output. I also do not really know how you could display it > differently after the fact. > > Is it possible that this is sometimes confusing? Sure. But that does > not mean it is wrong and as we have all pointed out in this thread, > this has not exactly been a problem people seem to be reporting or > experiencing.
I thought it would be helpful to try to give you a better example, so I dusted off the old repository we used to use to test some of the merge tracking scenarios. Refer to this graphic: http://www.open.collab.net/branding/images/projects/merge/repo.png I have a working copy of trunk and I do the merge shown as r14 (which is what will be created when I commit this merge). Here is the command I run and the diff output of the mergeinfo: $ svn merge ^/branches/b . --- Merging r10 through r13 into '.': A products/roadmap.html U products/index.html U about/index.html U index.html U news/index.html U . --- Recording mergeinfo for merge of r10 through r13 into '.': G . $ svn diff Index: . =================================================================== --- . (revision 13) +++ . (working copy) Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /branches/a:r6,8-11 Merged /branches/b:r10-13 This gives a simple example to talk about. What changes would you propose making to this output? -- Thanks Mark Phippard http://markphip.blogspot.com/
