Meld doesn't display subversion "conflicts" correctly
Bug #820385 reported by
John Pye
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| meld (Ubuntu) |
New
|
Undecided
|
Unassigned | ||
Bug Description
Using Ubuntu 11.04 and Meld 1.5.0-0ubuntu1, I did an "svn up" on my working code and got a conflict on one file. When I run "meld ." the conflicting file shows in Meld's file list, but when I click through to examine the conflict, I get a diff between the unmodified file and the svn markup with "<<<<<< .mine" etc included.
Screenshots on the Meld website suggest that 3-way diff might be a yet-to-be-completed feature, but I'm not sure about that.
Revision history for this message
| John Pye (jdpipe) wrote | #1 |
Revision history for this message
| Julian Taylor (jtaylor) wrote | #2 |
To post a comment you must log in.
meld can do 3-way-diffs but I don't think it can do it from a working copy with a postponed conflict.
You have to write a wrapper script for meld and set SVN_MERGE before doing svn up. When asked for action launch the external tool.
see this thread for an example: http://