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

Re: Merge bug in 1.5.7

From: Thomas Börkel <tbo_at_ap-ag.com>
Date: Tue, 10 Feb 2009 08:03:40 +0100

HI!

Stefan Küng wrote:

>> 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.
>
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1055161

Thanks. I did not see that message.

Any chance for a 1.5.8 based on Subversion 1.5 with that fix?

Thomas

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-10 08:04:42 CET

This message: [ Message body ]
Next message: Lübbe Onken: "Re: Rev graph colours"
Previous message: Hugh Gibson: "Re: How do I update to latest after "Revert to this revision"?"
In reply to: 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.