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

TMerge adding blank lines

From: Josha Foust <JoshaF_at_a-t-g.com>
Date: Tue, 17 Jun 2008 13:58:11 -0500

I am seeing TMerge insert blank lines when resolving conflicts in files.
I think this was mentioned a while back by someone else, but was not
demonstrated to be reproducible. Here is a reproduction recipe for it.

I'm running TortoiseSVN 1.5.0, Build 13177 on 32bit Win XP SP2.

1. Create a new file, in what will be called WC1, with the following
contents and add it to a repo:
a
b
c
d
e
f
g
h
i
j
2. Modify that file in WC1 by adding the following between d and e.
1
2
3
4
5
3. Checkout another copy of that file in WC2
4. Add an "A" on a blank line between d and e.
5. Commit the file in WC1.
6. Update WC2 and launch TMerge to resolve the conflict.
7. Click Next Conflict, Use "mine" text block, Mark as resolved.

You end up with a 4 blank lines between A and e. This does not seem
like desired behavior.

Josha Foust

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-17 20:58:25 CEST

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