equal
deleted
inserted
replaced
1404 tobackup.update(m + a + r + d) |
1404 tobackup.update(m + a + r + d) |
1405 |
1405 |
1406 self.applieddirty = True |
1406 self.applieddirty = True |
1407 end = len(self.applied) |
1407 end = len(self.applied) |
1408 rev = self.applied[start].node |
1408 rev = self.applied[start].node |
1409 if update: |
|
1410 top = self.checktoppatch(repo)[0] |
|
1411 |
1409 |
1412 try: |
1410 try: |
1413 heads = repo.changelog.heads(rev) |
1411 heads = repo.changelog.heads(rev) |
1414 except error.LookupError: |
1412 except error.LookupError: |
1415 node = short(rev) |
1413 node = short(rev) |
1426 # we know there are no local changes, so we can make a simplified |
1424 # we know there are no local changes, so we can make a simplified |
1427 # form of hg.update. |
1425 # form of hg.update. |
1428 if update: |
1426 if update: |
1429 qp = self.qparents(repo, rev) |
1427 qp = self.qparents(repo, rev) |
1430 ctx = repo[qp] |
1428 ctx = repo[qp] |
1431 m, a, r, d = repo.status(qp, top)[:4] |
1429 m, a, r, d = repo.status(qp, '.')[:4] |
1432 if d: |
1430 if d: |
1433 raise util.Abort(_("deletions found between repo revs")) |
1431 raise util.Abort(_("deletions found between repo revs")) |
1434 |
1432 |
1435 tobackup = set(a + m + r) & tobackup |
1433 tobackup = set(a + m + r) & tobackup |
1436 if keepchanges and tobackup: |
1434 if keepchanges and tobackup: |