Mercurial > hg
comparison tests/test-rename-merge2.t @ 23524:a1a7c94def6d
merge: don't report progress for dr/rd actions
It is easier to reason about certain algorithms in terms of a
file->action mapping than the current action->list-of-files. Bid merge
is already written this way (but with a list of actions per file), and
largefiles' overridecalculateupdates() will also benefit. However,
that requires us to have at most one action per file. That requirement
is currently violated by 'dr' (divergent rename) and 'rd' (rename and
delete) actions, which can exist for the same file as some other
action.
These actions are only used for displaying warnings to the user; they
don't change anything in the working copy or the dirstate. In this
way, they are similar to the 'k' (keep) action. However, they are even
less action-like than 'k' is: 'k' at least describes what to do with
the file ("do nothing"), while 'dr' and 'rd' or only annotations for
files for which there may exist other, "real" actions.
As a first step towards separating these acitons out, stop including
them in the progress output, just like we already exclude the 'k'
action.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 05 Dec 2014 16:13:26 -0800 |
parents | 208ec8ca7c79 |
children | 5668202cfaaf |
comparison
equal
deleted
inserted
replaced
23523:01a8dfc79cdc | 23524:a1a7c94def6d |
---|---|
380 branchmerge: True, force: False, partial: False | 380 branchmerge: True, force: False, partial: False |
381 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e | 381 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
382 preserving rev for resolve of rev | 382 preserving rev for resolve of rev |
383 c: remote created -> g | 383 c: remote created -> g |
384 getting c | 384 getting c |
385 updating: c 1/3 files (33.33%) | 385 updating: c 1/2 files (50.00%) |
386 rev: versions differ -> m | 386 rev: versions differ -> m |
387 updating: rev 2/3 files (66.67%) | 387 updating: rev 2/2 files (100.00%) |
388 picked tool 'python ../merge' for rev (binary False symlink False) | 388 picked tool 'python ../merge' for rev (binary False symlink False) |
389 merging rev | 389 merging rev |
390 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | 390 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
391 a: divergent renames -> dr | |
392 updating: a 3/3 files (100.00%) | |
393 note: possible conflict - a was renamed multiple times to: | 391 note: possible conflict - a was renamed multiple times to: |
394 b | 392 b |
395 c | 393 c |
396 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 394 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
397 (branch merge, don't forget to commit) | 395 (branch merge, don't forget to commit) |