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

TortoiseMerge Save discarding changes

From: Dan Climan <dcliman_at_keepmedia.com>
Date: 2006-05-10 21:15:18 CEST

I had some changes in the trunk version of a file that I was trying to apply to
a branch, but the changes keep getting discarded.

I open TortoiseMerge and put the full path to the trunk version in Base File and
put the path to the branch version in My File since this is the one I want to
change. I get a 2-pane view with the branch version on the right. I right-click
on one of grey boxes in the right hand pane and select "Use whole other file".
The display of this file now looks correct. I click on Save and the asterisk
telling me that the buffer was modified goes away and then I exit. When I look
at the branch file again (the one I thought I modified) it has an updated
timestamp, but the changes are gone.

I'm using TortoiseMerge 1.3.3, Build 6219 - 32 Bit

Am I doing something wrong in the sequence of steps? Can TortoiseMerge by used
to identify and merge trunk changes into a branch?


To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed May 10 22:25:48 2006

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.