Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 4232:0d51eb296fb9
Merge with crew-stable
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Fri, 16 Mar 2007 00:45:18 -0300 |
| parents | dbc3846c09a1 |
| children | 09c5f734ff6a |
comparison
equal
deleted
inserted
replaced
| 4224:2a8b6d78d7ee | 4232:0d51eb296fb9 |
|---|---|
| 448 wlock = repo.wlock() | 448 wlock = repo.wlock() |
| 449 | 449 |
| 450 wc = repo.workingctx() | 450 wc = repo.workingctx() |
| 451 if node is None: | 451 if node is None: |
| 452 # tip of current branch | 452 # tip of current branch |
| 453 node = repo.branchtags()[wc.branch()] | 453 try: |
| 454 node = repo.branchtags()[wc.branch()] | |
| 455 except KeyError: | |
| 456 raise util.Abort(_("branch %s not found") % wc.branch()) | |
| 454 overwrite = force and not branchmerge | 457 overwrite = force and not branchmerge |
| 455 forcemerge = force and branchmerge | 458 forcemerge = force and branchmerge |
| 456 pl = wc.parents() | 459 pl = wc.parents() |
| 457 p1, p2 = pl[0], repo.changectx(node) | 460 p1, p2 = pl[0], repo.changectx(node) |
| 458 pa = p1.ancestor(p2) | 461 pa = p1.ancestor(p2) |