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

[T-Merge bug] Use this block with moved block skip moved lines

From: Oto BREZINA <otik_at_printflow.eu>
Date: Sun, 03 Apr 2011 19:41:23 +0200

For long time I see this odd behaviour in TMerge, but had not time to
report that (make simple reproducible receipe).

What I did:
1. create two 4-line files:

1.txt:
1
2
3
4

2.txt:
1
3
2
4

2. run diff on those two files
3. mark all lines (on left panel)
4. select use this block (on left panel)
5. save (ctrl-S)
6. reload (F5)

What I get:
on right side one line is missing

What I expect:
whole selected block get copied to right side

Workaround:
Select block and copy it manually or repeat procedure once again. Note:
if some line from block are moved to other part of file, repeating would
not help.

Notes:
If this is intended behaviour - it have some logic, that moved lines are
not copied - even never used by me - different command may be needed.
(e.g. Use this block without moved lines)

-- 
Oto BREZINA, Printflow s.r.o., EU
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2716586
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-04-03 19:43:38 CEST

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