Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 18036:8b846dbc57b6
merge: support calculating merge actions against non-working contexts
This is not currently used. It is instead a pre-requisite to
performing non-conflicting grafts in memory, which a subsequent patch
will do.
| author | David Schleimer <dschleimer@fb.com> |
|---|---|
| date | Tue, 04 Dec 2012 12:54:18 -0800 |
| parents | 5881d5b7552f |
| children | 551e2901192e |
comparison
equal
deleted
inserted
replaced
| 18035:5881d5b7552f | 18036:8b846dbc57b6 |
|---|---|
| 459 _checkcollision(mctx, None) | 459 _checkcollision(mctx, None) |
| 460 else: | 460 else: |
| 461 _checkcollision(mctx, tctx) | 461 _checkcollision(mctx, tctx) |
| 462 if not force: | 462 if not force: |
| 463 _checkunknown(repo, tctx, mctx) | 463 _checkunknown(repo, tctx, mctx) |
| 464 action += _forgetremoved(tctx, mctx, branchmerge) | 464 if tctx.rev() is None: |
| 465 action += _forgetremoved(tctx, mctx, branchmerge) | |
| 465 action += manifestmerge(repo, tctx, mctx, | 466 action += manifestmerge(repo, tctx, mctx, |
| 466 ancestor, | 467 ancestor, |
| 467 force and not branchmerge, | 468 force and not branchmerge, |
| 468 partial) | 469 partial) |
| 469 return action | 470 return action |