/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to conflicts.py

  • Committer: Daniel Schierbeck
  • Date: 2008-01-23 16:36:21 UTC
  • mto: (423.1.8 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080123163621-x8kublc38ojipnly
Made the revision popup menu correctly add tags.

Show diffs side-by-side

added added

removed removed

Lines of Context:
conflicts.py
20
20
except:
21
21
    pass
22
22
 
23
 
import os
 
23
import subprocess
24
24
 
25
25
import gtk
26
26
import gobject
166
166
            base = self.wt.abspath(selected) + '.BASE'
167
167
            this = self.wt.abspath(selected) + '.THIS'
168
168
            other = self.wt.abspath(selected) + '.OTHER'
169
 
            os.system(self._entry_diff3.get_text() + ' ' + base + ' ' + this + ' ' + other)
 
169
            try:
 
170
                p = subprocess.Popen([ self._entry_diff3.get_text(), base, this, other ])
 
171
                p.wait()
 
172
            except OSError, e:
 
173
                warning_dialog(_('Call to external utility failed'), str(e))
170
174
        else:
171
175
            warning_dialog(_('Cannot resolve conflict'),
172
176
                           _('Only conflicts on the text of files can be resolved with Olive at the moment. Content conflicts, on the structure of the tree, need to be resolved using the command line.'))