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

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.

bye,

Erik.
Received on Sat May 13 08:46:03 2006