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

[TSVN] Update-to-rev with conflicted files

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-09-21 13:44:18 CEST

If I have a WC which contains a conflicted file and I update that folder to
an earlier revision, the conflicted file's friends get in a mess and it
becomes difficult to resolve the conflict. I don't think anyone would want
to do this, but it could happen by mistake.

Test.c is at rev 10 with mods
Update WC to head (13)

Test.c is conflicted.
Local files:
    Test.c.mine
    Test.c.r10
    Test.c.r13

Update WC to rev 11
Local files:
    As before plus ...
    Test.c.2.mine
    Test.c.2.r13
    Test.c.r11

Edit conflicts:
    Theirs: Test.c.r11
    Yours: Test.c.2.mine

Now both the merged file and my file are showing conflict markers in TMerge,
because incompatible files are being merged. This may be a bug in SVN.

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Sep 21 15:22:38 2004

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