[meld] filediff: Make conflict resolution prompt use correct path (bgo#756148)

commit 488f80dda2dcc826d4a9b6075132a92dd1af13f0
Author: Andrew Sutherland <asutherland asutherland org>
Date:   Fri Oct 9 06:38:17 2015 +1000

    filediff: Make conflict resolution prompt use correct path (bgo#756148)
    We were incorrectly using the loaded file, but Meld's conflict
    resolution code always sets a merge-output file. Until recently these
    always happened to be the same, but the new git merge changes made
    this no longer the case.

 meld/filediff.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meld/filediff.py b/meld/filediff.py
index 0aabdba..59ac13f 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -850,7 +850,8 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                 if resolve_response == Gtk.ResponseType.OK:
-                    conflict_file = self.textbuffer[1].data.filename
+                    bufdata = self.textbuffer[1].data
+                    conflict_file = bufdata.savefile or bufdata.filename
                     parent.command('resolve', [conflict_file])
         return response

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]