Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

Merge with stable

Changeset f3d41f688074…

Parents e84c18ab34e8…

Parents 38bd971853d1…

by Steve Borho

Changes to 3 files · Browse files at f3d41f688074 Showing diff from parent e84c18ab34e8 38bd971853d1 Diff from another changeset...

Change 1 of 1 Show Entire File setup.py Stacked
 
92
93
94
 
95
96
97
 
92
93
94
95
96
97
98
@@ -92,6 +92,7 @@
  for filename in os.listdir(pathname):   if filename.endswith('.py'):   filelist.append(os.path.join(pathname, filename)) + filelist.sort()     potfile = 'tortoisehg.pot'  
Show Entire File tortoisehg/​hgqt/​hgignore.py Stacked
(No changes)
Change 1 of 1 Show Entire File tortoisehg/​hgqt/​tag.py Stacked
 
296
297
298
299
 
300
301
302
303
 
304
305
306
 
296
297
298
 
299
300
301
302
 
303
304
305
306
@@ -296,11 +296,11 @@
  tagtype = self.repo.tagtype(tag)   if local:   if tagtype != 'local': - self.set_status(_("tag '%s' is not a local tag") % tagu) + self.set_status(_("tag '%s' is not a local tag") % tagu, False)   return   else:   if tagtype != 'global': - self.set_status(_("tag '%s' is not a global tag") % tagu) + self.set_status(_("tag '%s' is not a global tag") % tagu, False)   return   parents = self.repo.parents()   if len(parents) > 1: