Jody,
Please explain why the "resolved" process MODIFIES the original copy?
What you are saying and what is happening doesn't make sense. I am not
modifying the working copy per se, but WinMerge is modifying it.
Once I click the save buttun in winmerge, the right copy changes from
being "xxx.merge-right.rxx" to "xxx.working" on its own.
Greg
You should be saving the results in the original copy. The working copy is
just a copy made as a reference. When you mark it as resolved, it's just
deleting those 3 copies it made.
- Jody
On 1/27/06, Greg Kopp <greg@gregkopp.com> wrote:
>
> I have to use an external merge program (WinMerge, specifically
> WinMergeU.exe) because I am using Subversion with a Chinese language
> project. All of our files are saved in UTF-8 with signature (Codepage
> 65001) - TortoiseMerge looks at these files as binary and can't properly
> merge them.
>
> However, I seem to be experiencing a problem when merging a conflicted
> file using the external program and resolving the conflict.
>
> For example, if I am merging a file from two different branches and the
> merge conflicts, TSVN creates 3 new files: a merge-right.rXX, a
> merge-left.rYY and a .working copy of the conflicted file. When I right
> click and choose edit conflicts, WinMerge launches, puts the left file
> in the left pane, the right file in the right pane. Once I finish
> merging the differences and save it, the right pane changes to the
> .working copy of the file (as it should - I assume).
>
> If I examine the .working copy of the file, it looks like it should. All
> of the changes are properly merged. So now, I right click on the
> original conflicted file and choose Resolved. The three merge files
> disappear. But when I examine the original file, I see a bunch of stuff
> I do not believe should be in there.
>
> Here is the contents of the left file:
>
> This is line 1 in the trunk
> This is line 2 in the trunk
> This is line 3 of the trunk
>
> Here is the contents of the right file:
>
> This is line 1 in the trunk
> This is an added line from the branch.
> This is line 3 of the trunk
>
> Here is the contents of the working file:
>
> This is line 1 in the trunk
> This is a new line from the trunk.
> This is line 3 of the trunk
>
> I manually merge the files, so the right pane in WinMerge looks like
> this. The working copy changes to this as well:
>
> This is line 1 in the trunk
> This is line 2 in the trunk
> This is an added line from the branch.
> This is line 3 of the trunk
>
> Once I right click on the original file, this is what it turns into:
>
> This is line 1 in the trunk
> <<<<<<< .working
> This is a new line from the trunk.
> =======
> This is an added line from the branch.
> >>>>>>> .merge-right.r8
> This is line 3 of the trunk
Received on Sat Jan 28 03:25:56 2006