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

Re: Merging and gratuitous display of explicit mergeinfo.

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Fri, 07 Mar 2008 07:51:51 -0600

Karl Fogel wrote:
> Karl Fogel <kfogel_at_red-bean.com> writes:
>> At http://pastebin.ca/931468, you can see some merge behavior that
>> surprised me. I merged one revision from trunk to branch, affecting
>> two files. But afterwards, my formerly pristine branch working copy
>> showed *10* files changed: two of them were the ones I expected, and
>> the others had property changes to -- you guessed it -- svn:mergeinfo.
>>
>> Am I merely revisiting an old discussion here? Has this been hashed
>> out already? Was it already proposed that 'svn status' and 'svn diff'
>> not show changes to svn:mergeinfo by default (and take a -g flag to
>> mean "do count svn:mergeinfo property changes")?
>
> epg expressed interest in seeing the diff output too, so here it is:
>
> http://pastebin.ca/931473

FWIW, I've been seeing similar output (under the same conditions:
pristine WC, rechecked out from the "new" repository) when doing merges
to 1.5.x. See r29764 and r29765 for details.

-Hyrum

Received on 2008-03-07 14:52:10 CET

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