equal
deleted
inserted
replaced
53 $ echo 4d > outside/f |
53 $ echo 4d > outside/f |
54 $ hg commit -Aqm 'outside 4d' |
54 $ hg commit -Aqm 'outside 4d' |
55 |
55 |
56 $ hg update -r 'desc("outside 4a")' |
56 $ hg update -r 'desc("outside 4a")' |
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
58 $ hg merge -r 'desc("outside 4b")' 2>&1 | egrep -v '(warning:|incomplete!)' |
58 $ hg merge -r 'desc("outside 4b")' 2>&1 | grep -E -v '(warning:|incomplete!)' |
59 merging outside/f |
59 merging outside/f |
60 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
60 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
61 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
61 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
62 $ echo 5 > outside/f |
62 $ echo 5 > outside/f |
63 $ rm outside/f.orig |
63 $ rm outside/f.orig |
65 (no more unresolved files) |
65 (no more unresolved files) |
66 $ hg commit -m 'merge a/b 5' |
66 $ hg commit -m 'merge a/b 5' |
67 $ echo 6 > outside/f |
67 $ echo 6 > outside/f |
68 $ hg commit -Aqm 'outside 6' |
68 $ hg commit -Aqm 'outside 6' |
69 |
69 |
70 $ hg merge -r 'desc("outside 4c")' 2>&1 | egrep -v '(warning:|incomplete!)' |
70 $ hg merge -r 'desc("outside 4c")' 2>&1 | grep -E -v '(warning:|incomplete!)' |
71 merging outside/f |
71 merging outside/f |
72 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
72 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
73 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
73 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
74 $ echo 7 > outside/f |
74 $ echo 7 > outside/f |
75 $ rm outside/f.orig |
75 $ rm outside/f.orig |
77 (no more unresolved files) |
77 (no more unresolved files) |
78 $ hg commit -Aqm 'merge a/b/c 7' |
78 $ hg commit -Aqm 'merge a/b/c 7' |
79 $ echo 8 > outside/f |
79 $ echo 8 > outside/f |
80 $ hg commit -Aqm 'outside 8' |
80 $ hg commit -Aqm 'outside 8' |
81 |
81 |
82 $ hg merge -r 'desc("outside 4d")' 2>&1 | egrep -v '(warning:|incomplete!)' |
82 $ hg merge -r 'desc("outside 4d")' 2>&1 | grep -E -v '(warning:|incomplete!)' |
83 merging outside/f |
83 merging outside/f |
84 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
84 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
85 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
85 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
86 $ echo 9 > outside/f |
86 $ echo 9 > outside/f |
87 $ rm outside/f.orig |
87 $ rm outside/f.orig |
277 7162cc6d11a4 f2a632f0082d 000000000000 inside 2b |
277 7162cc6d11a4 f2a632f0082d 000000000000 inside 2b |
278 |
278 |
279 $ cd ../pullmaster |
279 $ cd ../pullmaster |
280 $ hg update -r 'desc("outside 4a")' |
280 $ hg update -r 'desc("outside 4a")' |
281 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
281 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
282 $ hg merge -r 'desc("outside 4b")' 2>&1 | egrep -v '(warning:|incomplete!)' |
282 $ hg merge -r 'desc("outside 4b")' 2>&1 | grep -E -v '(warning:|incomplete!)' |
283 merging inside/f |
283 merging inside/f |
284 merging outside/f |
284 merging outside/f |
285 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
285 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
286 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
286 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
287 $ echo 3 > inside/f |
287 $ echo 3 > inside/f |
291 (no more unresolved files) |
291 (no more unresolved files) |
292 $ hg commit -m 'merge a/b 5' |
292 $ hg commit -m 'merge a/b 5' |
293 |
293 |
294 $ hg update -r 'desc("outside 4c")' |
294 $ hg update -r 'desc("outside 4c")' |
295 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
295 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
296 $ hg merge -r 'desc("outside 4d")' 2>&1 | egrep -v '(warning:|incomplete!)' |
296 $ hg merge -r 'desc("outside 4d")' 2>&1 | grep -E -v '(warning:|incomplete!)' |
297 merging inside/f |
297 merging inside/f |
298 merging outside/f |
298 merging outside/f |
299 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
299 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
300 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
300 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
301 $ echo 3 > inside/f |
301 $ echo 3 > inside/f |