Mercurial > hg
diff tests/test-double-merge.t @ 18541:5ed6a375e9ca
merge: delay debug messages for merge actions
Show messages at a point where the actions have been sorted, thus preparing for
backout of 760c0d67ce5e.
This makes manifestmerge more of a silent operation, just like 'copies' is.
Indent 'preserving' messages to make them subordinate to the action logging so
they fit in the new context. (The 'preserving' messages are quite redundant and
could also be removed completely.)
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 24 Jan 2013 23:57:44 +0100 |
parents | a6fe1b9cc68f |
children | bcf29565d89f |
line wrap: on
line diff
--- a/tests/test-double-merge.t Thu Jan 24 23:57:44 2013 +0100 +++ b/tests/test-double-merge.t Thu Jan 24 23:57:44 2013 +0100 @@ -35,10 +35,10 @@ resolving manifests overwrite: False, partial: False ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 + foo: remote copied to bar -> m + preserving foo for resolve of bar foo: versions differ -> m - foo: remote copied to bar -> m - preserving foo for resolve of bar - preserving foo for resolve of foo + preserving foo for resolve of foo updating: foo 1/2 files (50.00%) picked tool 'internal:merge' for bar (binary False symlink False) merging foo and bar to bar