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

Re: Bug Report for TMerge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-04-06 19:35:57 CEST

Rob Dearden wrote:
> Hi, excellent tool but I am having problems with the following which I
> suspect is a bug
> I have installed TortoiseMerge and still have the issue
> I can't find any previous mention of this issue although there is a similar
> bug reported in v1.3.2 I think
> What I did:
> I have two text files to compare / merge
> TMerge loads 1.txt into the left hand pane and 2.txt into the right hand
> pane
> Since I wish to make the changes to 1.txt I use the switch option to switch
> the files around
> I merge the changes I want from 2.txt into 1.txt without a problem
> What I expected:
> I expected the new merged version of 1.txt to be saved as 1.txt
> What happened:
> When I save it always saves the changed file (1.txt) into the wrong file
> (2.txt)
> I hope I have not broken too many conventions in reporting this and that you
> find the information useful

Thanks for the detailed report!
Fixed in revision 6229.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Apr 6 19:38:17 2006

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