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

Re: Bug in TortoiseMerge, as released in version 1.5.3

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 06 Sep 2008 18:15:01 +0200

AKaplan_at_princeton.com wrote:
>
> To Whom It May Concern:
>
> I am reporting a bug found with TortoiseMerge, as distributed with the
> 1.5.3 version of the TortoiseSVN client:
>
> Observed behavior: When editing a conflict, I specified "Use Mine before
> Theirs." When I hit the Undo button, it actually removed content that
> was in the "Theirs" document and was not in the "Mine" document.
> Expected behavior: Undo returns the merged document to its previous
> state, and does not touch the "Theirs" copy.

Fixed in r13845.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-09-06 18:15:18 CEST

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