Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9.3, 2.0, and 2.0.1

stable resolve: use functioning revision sets

There should be revision set queries for the working parents, but they do not
appear to exist yet.

Changeset 6f0165b7f202…

Parent a36ea841846b…

by Steve Borho

Changes to one file · Browse files at 6f0165b7f202 Showing diff from parent a36ea841846b Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​resolve.py Stacked
 
196
197
198
199
 
200
201
202
 
206
207
208
209
 
210
211
212
 
196
197
198
 
199
200
201
202
 
206
207
208
 
209
210
211
212
@@ -196,7 +196,7 @@
  paths = self.getSelectedPaths(self.rtree)   if paths:   opts = {} - opts['rev'] = ["p1()"] + opts['rev'] = ['rev(%d)' % self.repo[None].p1().rev()]   opts['tool'] = self.tcombo.readValue()   dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)   if dlg: @@ -206,7 +206,7 @@
  paths = self.getSelectedPaths(self.rtree)   if paths:   opts = {} - opts['rev'] = ["p2()"] + opts['rev'] = ['rev(%d)' % self.repo[None].p2().rev()]   opts['tool'] = self.tcombo.readValue()   dlg = visdiff.visualdiff(self.repo.ui, self.repo, paths, opts)   if dlg: