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

Re: Conflict when merge tries to add

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-07-14 01:06:53 CEST

On Thu, 13 Jul 2006, Garrett Rooney wrote:

> As was recently pointed out by Andrew Reedick on the users list,
> currently, if 'svn merge' tries to add a file and that results in a
> conflict (say there was a different file with the same name added on
> both a branch and the trunk, and then you try and merge the branch
> into the trunk) we print out an A, not a C. There's a trivial change
> to fix that, but it causes some test failures, so I figured I should
> bring it up here to make sure that we really should print C. I mean
> it makes sense to me, but clearly someone at some point decided that
> printing A was correct, otherwise they wouldn't have wrote the tests
> that confirmed it...
>
> Just an oversight?

Looks that way. +1 on the patch.

  • application/pgp-signature attachment: stored
Received on Fri Jul 14 01:08:11 2006

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