Show More
@@ -1298,11 +1298,6 b' class localrepository(repo.repository):' | |||||
1298 | base = {} |
|
1298 | base = {} | |
1299 | remote_heads = remote.heads() |
|
1299 | remote_heads = remote.heads() | |
1300 | inc = self.findincoming(remote, base, remote_heads, force=force) |
|
1300 | inc = self.findincoming(remote, base, remote_heads, force=force) | |
1301 | if not force and inc: |
|
|||
1302 | self.ui.warn(_("abort: unsynced remote changes!\n")) |
|
|||
1303 | self.ui.status(_("(did you forget to sync?" |
|
|||
1304 | " use push -f to force)\n")) |
|
|||
1305 | return None, 1 |
|
|||
1306 |
|
1301 | |||
1307 | update, updated_heads = self.findoutgoing(remote, base, remote_heads) |
|
1302 | update, updated_heads = self.findoutgoing(remote, base, remote_heads) | |
1308 | if revs is not None: |
|
1303 | if revs is not None: | |
@@ -1323,6 +1318,12 b' class localrepository(repo.repository):' | |||||
1323 | " use push -f to force)\n")) |
|
1318 | " use push -f to force)\n")) | |
1324 | return None, 1 |
|
1319 | return None, 1 | |
1325 |
|
1320 | |||
|
1321 | if not force and inc: | |||
|
1322 | self.ui.warn(_("abort: unsynced remote changes!\n")) | |||
|
1323 | self.ui.status(_("(did you forget to sync?" | |||
|
1324 | " use push -f to force)\n")) | |||
|
1325 | return None, 1 | |||
|
1326 | ||||
1326 | if revs is None: |
|
1327 | if revs is None: | |
1327 | cg = self.changegroup(update, 'push') |
|
1328 | cg = self.changegroup(update, 'push') | |
1328 | else: |
|
1329 | else: |
General Comments 0
You need to be logged in to leave comments.
Login now