equal
deleted
inserted
replaced
1548 try: |
1548 try: |
1549 p1 = repo.lookup(p1) |
1549 p1 = repo.lookup(p1) |
1550 p2 = repo.lookup(p2) |
1550 p2 = repo.lookup(p2) |
1551 if p1 == wp[0].node(): |
1551 if p1 == wp[0].node(): |
1552 repo.dirstate.setparents(p1, p2) |
1552 repo.dirstate.setparents(p1, p2) |
1553 except RepoError: |
1553 except hg.RepoError: |
1554 pass |
1554 pass |
1555 |
1555 |
1556 files = {} |
1556 files = {} |
1557 try: |
1557 try: |
1558 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root, |
1558 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root, |