Login | Register
My pages Projects Community openCollabNet

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

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

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

Author otik
Full name Oto BREZINA
Date 2011-04-03 10:41:32 PDT
Message 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

« Previous message in topic | 1 of 2 | Next message in topic »

Messages

Show all messages in topic

[T-Merge bug] Use this block with moved block skip moved lines otik Oto BREZINA 2011-04-03 10:41:32 PDT
     Re: [T-Merge bug] Use this block with moved block skip moved lines steveking Stefan K√ľng 2011-04-04 10:40:09 PDT
Messages per page: