[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-13 03:48:42 CEST

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?

Daniel Rall

  • application/pgp-signature attachment: stored
Received on Sat May 13 03:49:20 2006

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