equal
deleted
inserted
replaced
1520 p2 = repo.lookup(p2) |
1520 p2 = repo.lookup(p2) |
1521 if p1 == wp[0].node(): |
1521 if p1 == wp[0].node(): |
1522 repo.dirstate.setparents(p1, p2) |
1522 repo.dirstate.setparents(p1, p2) |
1523 except hg.RepoError: |
1523 except hg.RepoError: |
1524 pass |
1524 pass |
1525 if opts.get('exact') or opts.get('import-branch'): |
1525 if opts.get('exact') or opts.get('import_branch'): |
1526 repo.dirstate.setbranch(branch or 'default') |
1526 repo.dirstate.setbranch(branch or 'default') |
1527 |
1527 |
1528 files = {} |
1528 files = {} |
1529 try: |
1529 try: |
1530 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root, |
1530 fuzz = patch.patch(tmpname, ui, strip=strip, cwd=repo.root, |