[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Diff shows added svn:mergeinfo prop as lots of new merges

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 12 Sep 2011 10:00:25 -0400

On Mon, Sep 12, 2011 at 9:50 AM, Julian Foad <julian.foad_at_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.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2011-09-12 16:04:45 CEST

This is an archived mail posted to the Subversion Dev mailing list.