[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: Karl Fogel <kfogel_at_red-bean.com>
Date: Fri, 07 Mar 2008 01:22:36 -0500

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:


To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-03-07 07:22:53 CET

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