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

[TSVN] Check for Modifications -> View Differences -> Mark Resolved Inserts Diff Markers

From: Nathan Kidd <nathan-svn_at_spicycrypto.ca>
Date: 2005-10-07 21:17:59 CEST


Recently a developer here ended up getting conflict merge markers in his
code without updating and without any accompanying .mine/.rxxx etc.
causing him some grief.

He is using the latest 1.2.4 release (32 bit), (I also checked the log
messages up to r4577 and saw no relevant changes.)

To reproduce:
1. check out

2. Show Log on ColumnProvider.cpp and update to r4033

3. Edit ColumnProvider.cpp: at line 256 insert, e.g.
// this line will conflict

4. Check for Modifications on ColumnProvider.cpp, it shows local and
remote modifications.

5. Right-click ColumnProvider.cpp and Compare with Working Copy

6. (assume naive user mode) Notice conflict, and click Mark as Resolved

7. Open ColumnProvider.cpp and notice that you have conflict markers now
inserted in your local file, but no .mine, .r4033, etc.

This user wanted to keep all his changes, and disregard the repo-side
changes, so he had to manually remove all the conflict markers.

a. My understanding is that Check for Modifications is just that, a
"check", so it shouldn't modify your local files.

b. I don't think it's possible to "resolve" without updating first
anyway, so the "mark as resolved" button should be disabled when
TortoiseMerge is launched from the Check for Modifications dialog.

Does that make sense?

Thanks for this great software!



To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Oct 7 21:16:42 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.