Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/merge.py @ 4177:ba51a8225a60
Merge with crew-stable
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Sat, 10 Mar 2007 17:45:32 -0800 |
| parents | bb70d5fa02ae |
| children | dbc3846c09a1 |
comparison
equal
deleted
inserted
replaced
| 4170:ac9e891f2c0f | 4177:ba51a8225a60 |
|---|---|
| 442 force = whether to force branch merging or file overwriting | 442 force = whether to force branch merging or file overwriting |
| 443 partial = a function to filter file lists (dirstate not updated) | 443 partial = a function to filter file lists (dirstate not updated) |
| 444 wlock = working dir lock, if already held | 444 wlock = working dir lock, if already held |
| 445 """ | 445 """ |
| 446 | 446 |
| 447 if node is None: | |
| 448 node = "tip" | |
| 449 | |
| 450 if not wlock: | 447 if not wlock: |
| 451 wlock = repo.wlock() | 448 wlock = repo.wlock() |
| 452 | 449 |
| 450 wc = repo.workingctx() | |
| 451 if node is None: | |
| 452 # tip of current branch | |
| 453 node = repo.branchtags()[wc.branch()] | |
| 453 overwrite = force and not branchmerge | 454 overwrite = force and not branchmerge |
| 454 forcemerge = force and branchmerge | 455 forcemerge = force and branchmerge |
| 455 wc = repo.workingctx() | |
| 456 pl = wc.parents() | 456 pl = wc.parents() |
| 457 p1, p2 = pl[0], repo.changectx(node) | 457 p1, p2 = pl[0], repo.changectx(node) |
| 458 pa = p1.ancestor(p2) | 458 pa = p1.ancestor(p2) |
| 459 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) | 459 fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2) |
| 460 | 460 |