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

[TSVN] empty lines added by TMerge

From: Roel Harbers <roel_at_roelharbers.nl>
Date: 2004-09-22 12:47:29 CEST

TMerge sometimes seems to add empty lines (that are not in either
"theirs" or "yours") to merged files.

Reproduction recipe:

Make a text file containing two lines:

first line
last line

Check out the file in two working copies.
In the first wc, add one line between these lines:

first line
x1
last line

In the second wc, add more than one line:

first line
y1
y2
y3
y4
last line

Commit the first wc.
Update the second. The file will be marked conflicted
Edit conflicts in TMerge
The lower pane now shows the following:

first line
--- Unresolved Conflict!! ---
--- Unresolved Conflict!! ---
--- Unresolved Conflict!! ---
--- Unresolved Conflict!! ---
last line

Select the four conflicted lines in the lower pane (click the first one,
hold shift and click the last one)
Choose "Use yours before theirs")
the lower pane now shows:

first line
y1
y2
y3
y4
x1

last line

So, 3 empty lines that were in neither version of the file have been
added. The only way to prevent it seems to be to select only the first
row, do "theirs before yours", and then "use yours" on the other lines.
However, this will put them in the wrong order, depending on which you
choose:

first line
x1
y1
y2
y3
y4
last line

or

first line
y1
x1
y2
y3
y4
last line

While what I want is this:
first line
y1
y2
y3
y4
x1
last line

Am I missing something here?

Regards,

Roel Harbers

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Sep 22 13:55:43 2004

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