Hi,
suppose I have a working copy with local mods. I copy it to another directory
and make commit from there. I then go back to the original working copy and
make update. But... I get conflicts for each changed file, althoughd local
differences are the same as diffs send by server. As I understand it, the
problem is with passing '-A' flag to diff3. When I pass '-E' instread, using
the three saved version, there are no conflicts. As I remember, '-A' was
added to show three versions on conflicts, but that option at the same time
causes all changes to be surrowneded by conflict markers.
I would say that it's better to switch to using '-E' and hope somebody will
fix diff3.
- Volodya
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Apr 15 15:19:19 2002