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

Output of merges to targets with sub-tree mergeinfo

From: Daniel Rall <dlr_at_finemaltcoding.com>
Date: 2007-08-24 19:19:06 CEST

On Aug 23, 2007, at 11:18 AM, David Glasser wrote:

> On 8/22/07, Paul Burba <pburba@collab.net> wrote:
>> Currently trunk behaves this way if we perform a merge that
>> affects only
>> a subtree:
>>> svn merge %URL%/A merge_tests-1\A_COPY -c3
>> --- Merging r3:
>> --- Merging r3:
>> U merge_tests-1\A_COPY\D\H\psi
>> --- Merging r3:
> I'm not sure I am qualified to speak to the actual underlying
> mergeinfo issues here. But as far as UI is concerned, this output is
> somewhat strange, with the three "Merging r3:" lines. Maybe it would
> be more clear if the "--- Merging" lines mentioned the paths as well?

David, in general I tend to agree. For the particular case above,
I'm in violent agreement. How about this?

$ svn merge -c -26286 https://svn.collab.net/repos/svn/trunk/www www
--- Undoing r26286 for 'www':

See attached patch.

- Dan

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

  • application/octet-stream attachment: patch
Received on Fri Aug 24 19:09:37 2007

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