equal
deleted
inserted
replaced
1183 self.checkpatchname(name) |
1183 self.checkpatchname(name) |
1184 break |
1184 break |
1185 except error.Abort: |
1185 except error.Abort: |
1186 pass |
1186 pass |
1187 i += 1 |
1187 i += 1 |
1188 name = '%s__%s' % (namebase, i) |
1188 name = '%s__%d' % (namebase, i) |
1189 return name |
1189 return name |
1190 |
1190 |
1191 def checkkeepchanges(self, keepchanges, force): |
1191 def checkkeepchanges(self, keepchanges, force): |
1192 if force and keepchanges: |
1192 if force and keepchanges: |
1193 raise error.Abort(_('cannot use both --force and --keep-changes')) |
1193 raise error.Abort(_('cannot use both --force and --keep-changes')) |