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

Manually removing conflict files causes TSVN confusion

From: Nathan Kidd <nathan.kidd_at_hummingbird.com>
Date: 2007-12-19 21:21:52 CET

Using: TortoiseSVN 1.4.99, Build 11633 - 32 Bit -dev, 2007/12/17

1. merge a file such that you get a conflict
2. manually edit the file to resolve conflicts
3. delete all the conflict files (.merge-left/.merge-right/.working, etc.)
4. select file and commit
5. Result:
5.1 text status for file is shown as modified, but file name is shown in
red (as if conflicted)
5.2 double-clicking file to get diff results in error to the effect of
"cannot find FILE.merge-left.rNNN", however right-clicking file and
"Compare with base" does work.

Attempting to manually TSVN-> Mark as Resolved showed an empty list. I
had to manually create a file called FILE.merge-left.rNNN and then I
could Mark as Resolved, after which the commit properly showed the file
in blue and double-click diff worked.


It seems the new merge tracking stores conflicted status internally (it
used to be okay to do Step 3, deleting conflicted files), but TSVN seems
to be still using existence of the conflicted files to determine if a
file is conflicted?

Thanks for TSVN,


P.S. Why do step 2 and 3 in the first place? No matter what I tried I
couldn't make tortoiseMerge save my selections of how to resolve the
conflict. If I get time I'll try to provide a reproducible recipe.

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Dec 19 21:43:08 2007

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