[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: David Glasser <glasser_at_davidglasser.net>
Date: Thu, 6 Mar 2008 22:50:54 -0800

On Thu, Mar 6, 2008 at 10:19 PM, Karl Fogel <kfogel_at_red-bean.com> wrote:
> 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")?

Just to double-check: this isn't a pre-repository-refresh wc, is it?


David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
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:51:10 CET

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