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

TortoiseMerge requests a filename to save a file with resolved conflicts.

From: Ryan Hardey <rhardey_at_telus.net>
Date: 2007-06-26 22:06:34 CEST

Hi,

Using TortoiseSVN I right-click on the 'Edit conflicts' menu item and
TortoiseMerge starts. I then make the required changes and try to
save. Rather than saving to the conflicted file, a 'save as' dialog
then appears.

If I was editing a file, say hello.c, I would have expected that
TortoiseMerge would save to that file (after first using hello.c.rX,
hello.c.rY and hello.c.working to display and resolve the conflicts).
What am I missing? From reading the help documents it appears that the
/merged option is not being set when TortoiseSVN launches TMerge. What
do I need to do to get this to work so that it automatically updates the
file with the conflicts?

I am using TortoiseSVN v1.4.4 build 9706.

Thanks,
Ryan.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Jun 26 22:06:32 2007

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