Conflicts between added files.

Hello

Suppose I've added a file in WC. Then I send a patch to
and it's applied in the repository. I update and get
an error, saying that the file already exists.

This is rather common and inconvenient situation. Given
that 3-way merge is not possible, the question is what
behaviour is the best. I believe that WC file should be
modified to show all changes made in repository. I.e.
it should has conflict marker for every change from
repository. This way I can see what exactly was changed.

After experimenting with diff3, I've got the behaviour
which is close to what I want, using

   diff3 -Am my repo my

Example files and merged result is attached. Does this
behaviour look reasonable?

If so, I can try to change update to use this command
when handling file addition.

- Volodya

int func()
{
}

int func2()
{
}

/* nonsense */

/* Profound comment */
int func()
{
}

int func2()
{
}

<<<<<<< my

=======
/* Profound comment */
>>>>>>> repo
int func()
{
}

int func2()
{
}

<<<<<<< my

/* nonsense */
=======
>>>>>>> repo

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Nov 25 13:25:45 2002