Mercurial > hg
comparison tests/test-rename-merge2.t @ 21082:0d67fccc0d43
merge: let manifestmerge emit 'keep' actions when keeping wd version
Such a 'keep' action will later be the preferred (non)action when there
is multiple ancestors. It is thus very convenient to have it explicitly.
The extra actions will only be emitted in the case where the local file has
changed since the ancestor but the other hasn't. That is the symmetrical
operation to a 'get' action.
This will create more action tuples that not really serve a purpose. The number
of actions will however have the number of changed files as upper bound and it
should thus not increase the memory/cpu use significantly.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 07 Apr 2014 02:12:28 +0200 |
| parents | 7731a2281cf0 |
| children | e741972017d9 |
comparison
equal
deleted
inserted
replaced
| 21081:ffd7b6ce46ff | 21082:0d67fccc0d43 |
|---|---|
| 84 src: 'a' -> dst: 'b' * | 84 src: 'a' -> dst: 'b' * |
| 85 checking for directory renames | 85 checking for directory renames |
| 86 resolving manifests | 86 resolving manifests |
| 87 branchmerge: True, force: False, partial: False | 87 branchmerge: True, force: False, partial: False |
| 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 | 88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
| 89 a: keep -> k | |
| 89 b: remote copied from a -> m | 90 b: remote copied from a -> m |
| 90 preserving a for resolve of b | 91 preserving a for resolve of b |
| 91 rev: versions differ -> m | 92 rev: versions differ -> m |
| 92 preserving rev for resolve of rev | 93 preserving rev for resolve of rev |
| 93 updating: b 1/2 files (50.00%) | 94 updating: b 1/2 files (50.00%) |
| 568 unmatched files new in both: | 569 unmatched files new in both: |
| 569 b | 570 b |
| 570 resolving manifests | 571 resolving manifests |
| 571 branchmerge: True, force: False, partial: False | 572 branchmerge: True, force: False, partial: False |
| 572 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 | 573 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
| 574 a: keep -> k | |
| 573 b: versions differ -> m | 575 b: versions differ -> m |
| 574 preserving b for resolve of b | 576 preserving b for resolve of b |
| 575 rev: versions differ -> m | 577 rev: versions differ -> m |
| 576 preserving rev for resolve of rev | 578 preserving rev for resolve of rev |
| 577 updating: b 1/2 files (50.00%) | 579 updating: b 1/2 files (50.00%) |