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

Merge bug in 1.5.7

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: Mon, 09 Feb 2009 17:32:33 +0100

HI!

When I have a block of lines with merge conflict and resolve the
complete block using "theirs", then Tortoise kills the LFs in the
resulting block.

This happens only in 1.5.7. 1.5.6. is OK.

Using x64 on Windows Server 2008.

Thomas

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=1129643

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-09 17:33:38 CET

This message: [ Message body ]
Next message: Stefan Küng: "Re: Merge bug in 1.5.7"
Previous message: Oddvar Kloster: "Feature req: switch/update to rev from rev graph"
Next in thread: Stefan Küng: "Re: Merge bug in 1.5.7"
Reply: Stefan Küng: "Re: Merge bug in 1.5.7"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.