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

Bug: TortoiseMerge destroys lines if "ignore whitespace changes" is selected

From: Jarmo Torvinen <jarmo.torvinen_at_iki.fi>
Date: 2006-10-06 10:47:19 CEST

Tested on: TortoiseSVN 1.4.0, Build 7501 - 32 Bit
OS: Windows XP SP2

Steps to reproduce:
1) Make a text file that looks like this and commit it to repository
(test_file.c):
// line 1
// line 2
// line 3
// line 4
// line 5
// line 6
// line 7
// line 8

2) edit it in your local working copy to look like this (edit lines 2 and 7):
// line 1
// line <tab>2
// line 3
// line 4
// line 5
// line 6
// line 7 has now more text
// line 8

3) Right click on file in WC and selectTortoiseSVN > Diff
4) You can see that lines 2 and 7 were edited
5) Make sure from TortoiseMerge settings that "ignore whitespace
changes" is selected
6) click on line 7 in the "working base" document
7) Right click and from pop up select "Use This Text Block"
8) Press esc
9) TortoiseMerge ask: "Do you want to save your changes?", answer "Yes"
10) open up test_file.c in another editor and you note that line 2 is missing!

-- 
Jarmo
"Even he, to whom most things that most people
would think were pretty smart were pretty dumb,
thought it was pretty smart."  Douglas Adams
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Oct 6 10:48:46 2006

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.