/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: Szilveszter Farkas (Phanatic)
  • Date: 2007-05-17 16:12:27 UTC
  • mto: This revision was merged to the branch mainline in revision 201.
  • Revision ID: szilveszter.farkas@gmail.com-20070517161227-9e37lj2rm2t0cwj6
Some small modifications to Branch, Checkout and Info to support remote branches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
conflicts.py
20
20
except:
21
21
    pass
22
22
 
23
 
import subprocess
 
23
import os
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
 
            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))
 
169
            os.system(self._entry_diff3.get_text() + ' ' + base + ' ' + this + ' ' + other)
174
170
        else:
175
171
            warning_dialog(_('Cannot resolve conflict'),
176
172
                           _('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.'))