Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 8f7c2b92556a…

Parents 5901b9c88cc1…

Parents 16540a30efc2…

by Steve Borho

Changes to one file · Browse files at 8f7c2b92556a Showing diff from parent 5901b9c88cc1 16540a30efc2 Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgtk/​tagadd.py Stacked
 
122
123
124
125
 
 
126
127
128
 
157
158
159
 
160
161
162
 
122
123
124
 
125
126
127
128
129
 
158
159
160
161
162
163
164
@@ -122,7 +122,8 @@
  """ update revision entry based on tag """   tagmap = self.repo.tags()   tag = self.tagentry.get_text() - if not tag or hglib.fromutf(tag) not in tagmap: + replace = self.replacechk.get_active() + if not tag or hglib.fromutf(tag) not in tagmap or replace:   if self.initial_rev:   self.reventry.set_text(self.initial_rev)   return @@ -157,6 +158,7 @@
  is_local = self.repo.tagtype(hglib.fromutf(tag))   if affectlocal and is_local is not None:   self.localchk.set_active(is_local == 'local') + self.update_revision()     def load_settings(self):   expanded = self.settings.get_value('expanded', False, True)