Re: Bug Report: Tortise Merge - Use this whole file

Thanks for looking into it.

The file is listed in the text status as modified, does it list as conflicted if it is conflicted?

I tried it again with the same effect. There are no extra files in the directory so I don't think this fits the conflict scenario. Also I looked at the actual file after using the "use this whole file" option and the file did change but not to what it showed it should change to in the working copy.

Am I missing something?

Here is another perhaps easier use case,
load up the file that was modified,
in the working base select a change and say "use this whole file",
you notice the change moving over to the working copy,
now save - the working copy no longer shows a star as having modifications,
now use the file - reload,
the working copy comes back as it was at the start of the operation.

If I take a look at the actual file it remains unchanged.

I have an account on the issue tracker but I didn't see any upload buttons - my account it probably just as limited as guest I suppose or perhaps more. I zipped the .mov into 640k if you want to have a look but as you said the description should be enough.

Thanks again,

MG

>But if the file is conflicted and not just modified, then it only
*seems* as if the save didn't work. Maybe I need to explain the
'conflict' situation here:

I case you have a file in conflict (e.g. due to an update), Subversion
creates two new files:
1) one file with the content from the HEAD of the repository
2) one file with the content as the file was before the update (with
your local modifications)
3) it also modifies the 'original' file in the working copy so it
contains conflict markers (<<<<<<<<<<<< and >>>>>>>>>>>> lines in the
text file).

If you now doubleclick on such a conflicted file, TortoiseMerge is
started with file 1, 2 and the BASE file (the file as it was before you
modified it locally). Saving however saves the file to the file 3).

If you then doubleclick again, TortoiseMerge still shows you the diffs
between file 1, 2 and the BASE (which haven't changed due to the
previous 'save' operation).

 
____________________________________________________________________________________
Sucker-punch spam with award-winning protection.
Try the free Yahoo! Mail Beta.
http://advision.webevents.yahoo.com/mailbeta/features_spam.html
Received on Fri Mar 16 20:20:31 2007