TMerge bug when adding text by hand
From: David Balažic <david.balazic_at_hermes-softlab.com>
Date: Mon, 15 Jun 2009 15:48:20 +0200
TortoiseMerge 1.6.2, Build 16344 - 32 Bit , 2009/05/09 13:46:29
Change a file by removing a few files:
- new file:
Compare them.
In the left pane add some text in the removed area:
one
four
Press ctrl-s.
Expected result:
Actual result (the new file, as shown in TMerge and saved to disk - verified by loading into notepad):
The problem is, that the new added text is merged by the following (unchanged) line.
Regards,
---------------------------------------------------------------------
--- David Balažic mailto:david.balazic_at_hermes-softlab.com HERMES Softlab http://www.hermes-softlab.com Zagrebska cesta 104 Phone: +386 2 450 8937 SI-2000 Maribor Slovenija --------------------------------------------------------------------- "Be excellent to each other." - Bill S. Preston, Esq. & "Ted" Theodore Logan --------------------------------------------------------------------- ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2362177 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].Received on 2009-06-15 15:49:15 CEST |
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.