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

Re: #2403: Incorrect merge of binary file when already existing

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-05-19 00:52:14 CEST

On Sat, 13 May 2006, Erik Huelsmann wrote:

> On 5/13/06, Daniel Rall <dlr@collab.net> wrote:
> >While working on the test case for this issue, another question came
> >up: When doing a 3-way merge, URL1 -> URL2 -> WC, of a file added
> >between URL1 and URL2 that already exists as a versioned resource in
> >the WC, should we report it as an 'A'dd?
> >
> >Here's how things currently stand, no matter how many times you
> >perform the merge:
> >
> > trunk$ svn merge $URL1/older-branch $URL2/trunk
> > A A/theta
> >
> >Since the versioned resource "A/theta" already exists in the
> >repository on the "trunk" and is managed by the working copy, should
> >we silently ignore it during the merge?
> I'm strongly in favor of making the answer to this question depend on
> issue 2282.

While I agree with Eric, 2282 looked like quite a can of worms, so I
committed the bug fix as-is in r19688 on the grounds that arguably
incorrect output is worse that a silent failure plus a conflict.

Daniel Rall

  • application/pgp-signature attachment: stored
Received on Fri May 19 00:52:42 2006

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