Mercurial > hg
comparison tests/test-merge-tools.t @ 26614:ef1eb6df7071
simplemerge: move conflict warning message to filemerge
The current output for a failed merge with conflict markers looks something like:
merging foo
warning: conflicts during merge.
merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
merging bar
warning: conflicts during merge.
merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
We're going to change the way merges are done to perform all premerges before
all merges, so that the output above would look like:
merging foo
merging bar
warning: conflicts during merge.
merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
warning: conflicts during merge.
merging bar incomplete! (edit conflicts, then use 'hg resolve --mark')
The 'warning: conflicts during merge' line has no context, so is pretty
confusing.
This patch will change the future output to:
merging foo
merging bar
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
The hint on how to resolve the conflicts makes this a bit unwieldy, but solving
that is tricky because we already hint that people run 'hg resolve' to retry
unresolved merges. The 'hg resolve --mark' mostly applies to conflict marker
based resolution.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 09 Oct 2015 13:54:52 -0700 |
parents | a5ff66e6d77a |
children | a1e43e85d294 |
comparison
equal
deleted
inserted
replaced
26613:abb5ec3eb6ce | 26614:ef1eb6df7071 |
---|---|
65 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're | 65 override $PATH to ensure hgmerge not visible; use $PYTHON in case we're |
66 running from a devel copy, not a temp installation | 66 running from a devel copy, not a temp installation |
67 | 67 |
68 $ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 | 68 $ PATH="$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 |
69 merging f | 69 merging f |
70 warning: conflicts during merge. | 70 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
71 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
72 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 71 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
73 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 72 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
74 [1] | 73 [1] |
75 $ aftermerge | 74 $ aftermerge |
76 # cat f | 75 # cat f |
111 | 110 |
112 $ echo "echo fail" > false | 111 $ echo "echo fail" > false |
113 $ hg up -qC 1 | 112 $ hg up -qC 1 |
114 $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 | 113 $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 |
115 merging f | 114 merging f |
116 warning: conflicts during merge. | 115 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
117 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
118 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 116 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
119 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 117 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
120 [1] | 118 [1] |
121 $ rm false | 119 $ rm false |
122 | 120 |
126 | 124 |
127 $ mkdir false | 125 $ mkdir false |
128 $ hg up -qC 1 | 126 $ hg up -qC 1 |
129 $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 | 127 $ PATH="`pwd`:$BINDIR:/usr/sbin" $PYTHON "$BINDIR"/hg merge -r 2 |
130 merging f | 128 merging f |
131 warning: conflicts during merge. | 129 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
132 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
133 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 130 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
134 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 131 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
135 [1] | 132 [1] |
136 $ rmdir false | 133 $ rmdir false |
137 | 134 |
1022 $ ln -s symlink f | 1019 $ ln -s symlink f |
1023 $ hg commit -qm 'f is symlink' | 1020 $ hg commit -qm 'f is symlink' |
1024 $ hg merge -r 2 --tool internal:merge | 1021 $ hg merge -r 2 --tool internal:merge |
1025 merging f | 1022 merging f |
1026 warning: internal :merge cannot merge symlinks for f | 1023 warning: internal :merge cannot merge symlinks for f |
1027 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | 1024 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
1028 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 1025 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
1029 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 1026 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
1030 [1] | 1027 [1] |
1031 | 1028 |
1032 #endif | 1029 #endif |