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

Mike Grandmaison wrote:
> Bug Report: Tortise Merge - Use this whole file from working base and
> saving to working copy does not work. File remains unchanged.
>
> Steps:
>
> Check for modifications,
> x2 click file,
> rclick working base change,
> use this whole file,
> ctrl-s,
> exit try again,
> file still in original state.

I can't reproduce this (I'm using the latest version from trunk). It
works as expected.

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).

> I made a quicktime video of the problem if you are interested it is
> 11megs though so obviously I won't post it to the mailing-list. Doesn't
> look to be a way to attach it to fly spray if you were interested though.

Upload to the issue tracker is limited to 2 megs. And I think it doesn't
work if you're simply have a guest account.
Anyway: 11 megs are way too much. Screenshots are more than enough. And
in this case, I think the description should be enough too.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org