Mercurial > hg > mercurial-crew

comparison tests/test-merge9.t @ 27258:8e6d5b7317e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.mergestate: perform all premerges before any merges (BC) We perform all that we can non-interactively before prompting the user for input via their merge tool. This allows for a maximally consistent state when the user is first prompted. The test output changes indicate the actual behavior change happening.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 21:56:39 -0700
parents ef1eb6df7071
children
comparison
equal deleted inserted replaced
27257:dfd9811c5c9b 27258:8e6d5b7317e6
25 created new head 25 created new head
26 26
27 test with the rename on the remote side 27 test with the rename on the remote side
28 $ HGMERGE=false hg merge 28 $ HGMERGE=false hg merge
29 merging bar 29 merging bar
30 merging foo and baz to baz
30 merging bar failed! 31 merging bar failed!
31 merging foo and baz to baz
32 1 files updated, 1 files merged, 0 files removed, 1 files unresolved 32 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
33 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 33 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
34 [1] 34 [1]
35 $ hg resolve -l 35 $ hg resolve -l
36 U bar 36 U bar
39 test with the rename on the local side 39 test with the rename on the local side
40 $ hg up -C 1 40 $ hg up -C 1
41 3 files updated, 0 files merged, 1 files removed, 0 files unresolved 41 3 files updated, 0 files merged, 1 files removed, 0 files unresolved
42 $ HGMERGE=false hg merge 42 $ HGMERGE=false hg merge
43 merging bar 43 merging bar
44 merging baz and foo to baz
44 merging bar failed! 45 merging bar failed!
45 merging baz and foo to baz
46 1 files updated, 1 files merged, 0 files removed, 1 files unresolved 46 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
47 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 47 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
48 [1] 48 [1]
49 49
50 show unresolved 50 show unresolved