Ask which file to us when merge markers are still in file on 'Resolving' a conflicting file
GoogleCodeExporter opened this issue · comments
1. Sometimes SVN claims there are merge issues when there really are none.
2. I choose 'resolve' which opens FileMerge. FileMerge tells me that there are
no changes.
3. If I don't save in FileMerge and go back to SVNX and choose 'Resolved', none
of the merge markers are removed.
This results in files committed that weren't properly merged.
What is the expected output? What do you see instead?
Either cleanup the file or pull up a sheet that asks based on which file it
should be resolved.
What version of the product are you using? On what operating system?
1.3 with 10.6.6
Original issue reported on code.google.com by martin.t...@gmail.com on 31 Jan 2011 at 4:23
> 1. Sometimes SVN claims there are merge issues when there really are none.
If conflict markers were added to the file then there ARE issues.
> 2. I choose 'resolve' which opens FileMerge. FileMerge tells me that there
are no changes.
As far as I can see FileMerge does indicate the number of conflicts (in the
bottom left of the window).
It also takes a first stab at resolving them. (It's usually pretty good.)
However, it doesn't mark the file/window as edited. This may be considered a
bug in FileMerge.
> 3. If I don't save in FileMerge and go back to SVNX and choose 'Resolved',
none of the merge markers are removed.
> This results in files committed that weren't properly merged.
The Resolved command does not modify the files. It only clears the svn
'conflicted' status.
See <http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.resolved.html> .
You could use the Review & Commit window to review your changes before you
commit them. (That's what it's for.)
> Either cleanup the file or pull up a sheet that asks based on which file it
should be resolved.
I don't really see how svnX can "cleanup the file". "Pull up a sheet that
asks" what?
The Update & Merge sheets have 'Accept' pop-ups that lets you specify how a
merge conflict should be resolved.
Original comment by chris...@gmail.com on 31 Jan 2011 at 7:22
Original comment by chris...@gmail.com on 14 Apr 2011 at 12:49
- Changed state: Invalid
It would be great if on clicking a file as resolved, SVNX would check the
working file for conflict markers. If it finds conflict makers still in the
file SVNX should inform the user before marking the file as resolved about that
issue. At that point the user can determine to go ahead or cancel and revisit.
Original comment by martin.t...@gmail.com on 8 May 2011 at 7:06