equal
deleted
inserted
replaced
1520 # update the dirstate in place, strip off the qtip commit |
1520 # update the dirstate in place, strip off the qtip commit |
1521 # and then commit. |
1521 # and then commit. |
1522 # |
1522 # |
1523 # this should really read: |
1523 # this should really read: |
1524 # mm, dd, aa = repo.status(top, patchparent)[:3] |
1524 # mm, dd, aa = repo.status(top, patchparent)[:3] |
1525 # but we do it backwards to take advantage of manifest/chlog |
1525 # but we do it backwards to take advantage of manifest/changelog |
1526 # caching against the next repo.status call |
1526 # caching against the next repo.status call |
1527 mm, aa, dd = repo.status(patchparent, top)[:3] |
1527 mm, aa, dd = repo.status(patchparent, top)[:3] |
1528 changes = repo.changelog.read(top) |
1528 changes = repo.changelog.read(top) |
1529 man = repo.manifest.read(changes[0]) |
1529 man = repo.manifest.read(changes[0]) |
1530 aaa = aa[:] |
1530 aaa = aa[:] |