Mercurial > hg
comparison mercurial/copies.py @ 6283:5a45c82fc7da
Revert cfebb175704f, fixing the output of 2 tests
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 15 Mar 2008 22:03:18 -0300 |
| parents | cfebb175704f |
| children | 3ee6f1fce94a |
comparison
equal
deleted
inserted
replaced
| 6282:709652cd7bff | 6283:5a45c82fc7da |
|---|---|
| 66 if rev2 is None: # c2 is a workingctx | 66 if rev2 is None: # c2 is a workingctx |
| 67 rev2 = c2.parents()[0].rev() | 67 rev2 = c2.parents()[0].rev() |
| 68 pr = repo.changelog.parentrevs | 68 pr = repo.changelog.parentrevs |
| 69 def parents(rev): | 69 def parents(rev): |
| 70 return [p for p in pr(rev) if p != nullrev] | 70 return [p for p in pr(rev) if p != nullrev] |
| 71 limit = min(ancestor.symmetricdifference(rev1, rev2, parents) + [rev1, rev2]) | 71 limit = min(ancestor.symmetricdifference(rev1, rev2, parents)) |
| 72 m1 = c1.manifest() | 72 m1 = c1.manifest() |
| 73 m2 = c2.manifest() | 73 m2 = c2.manifest() |
| 74 ma = ca.manifest() | 74 ma = ca.manifest() |
| 75 | 75 |
| 76 def makectx(f, n): | 76 def makectx(f, n): |