Mercurial > hg
comparison tests/test-merge-tools.out @ 9468:b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
| author | Stuart W Marks <smarks@smarks.org> |
|---|---|
| date | Thu, 17 Sep 2009 22:39:38 -0700 |
| parents | 01ada7b1861d |
| children | 08a0f04b56bd |
comparison
equal
deleted
inserted
replaced
| 9467:4c041f1ee1b4 | 9468:b2310903c462 |
|---|---|
| 15 # hg merge -r 2 | 15 # hg merge -r 2 |
| 16 merging f | 16 merging f |
| 17 warning: conflicts during merge. | 17 warning: conflicts during merge. |
| 18 merging f failed! | 18 merging f failed! |
| 19 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 19 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 20 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 20 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 21 # cat f | 21 # cat f |
| 22 <<<<<<< local | 22 <<<<<<< local |
| 23 revision 1 | 23 revision 1 |
| 24 ======= | 24 ======= |
| 25 revision 2 | 25 revision 2 |
| 35 # hg update -C 1 | 35 # hg update -C 1 |
| 36 # hg merge -r 2 | 36 # hg merge -r 2 |
| 37 merging f | 37 merging f |
| 38 merging f failed! | 38 merging f failed! |
| 39 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 39 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 40 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 40 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 41 # cat f | 41 # cat f |
| 42 revision 1 | 42 revision 1 |
| 43 space | 43 space |
| 44 # hg stat | 44 # hg stat |
| 45 M f | 45 M f |
| 67 # hg update -C 1 | 67 # hg update -C 1 |
| 68 # hg merge -r 2 --config merge-tools.true.priority=-7 | 68 # hg merge -r 2 --config merge-tools.true.priority=-7 |
| 69 merging f | 69 merging f |
| 70 merging f failed! | 70 merging f failed! |
| 71 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 |
| 72 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 72 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 73 # cat f | 73 # cat f |
| 74 revision 1 | 74 revision 1 |
| 75 space | 75 space |
| 76 # hg stat | 76 # hg stat |
| 77 M f | 77 M f |
| 84 # hg update -C 1 | 84 # hg update -C 1 |
| 85 # hg merge -r 2 --config merge-tools.false.priority=117 | 85 # hg merge -r 2 --config merge-tools.false.priority=117 |
| 86 merging f | 86 merging f |
| 87 merging f failed! | 87 merging f failed! |
| 88 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 88 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 89 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 89 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 90 # cat f | 90 # cat f |
| 91 revision 1 | 91 revision 1 |
| 92 space | 92 space |
| 93 # hg stat | 93 # hg stat |
| 94 M f | 94 M f |
| 101 # hg update -C 1 | 101 # hg update -C 1 |
| 102 # hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool | 102 # hg merge -r 2 --config merge-tools.true.executable=nonexistingmergetool |
| 103 merging f | 103 merging f |
| 104 merging f failed! | 104 merging f failed! |
| 105 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 105 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 106 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 106 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 107 # cat f | 107 # cat f |
| 108 revision 1 | 108 revision 1 |
| 109 space | 109 space |
| 110 # hg stat | 110 # hg stat |
| 111 M f | 111 M f |
| 118 # hg update -C 1 | 118 # hg update -C 1 |
| 119 # hg merge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool | 119 # hg merge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool |
| 120 merging f | 120 merging f |
| 121 merging f failed! | 121 merging f failed! |
| 122 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 122 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 123 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 123 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 124 # cat f | 124 # cat f |
| 125 revision 1 | 125 revision 1 |
| 126 space | 126 space |
| 127 # hg stat | 127 # hg stat |
| 128 M f | 128 M f |
| 183 # hg update -C 1 | 183 # hg update -C 1 |
| 184 # hg merge -r 2 --config merge-patterns.f=false | 184 # hg merge -r 2 --config merge-patterns.f=false |
| 185 merging f | 185 merging f |
| 186 merging f failed! | 186 merging f failed! |
| 187 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 187 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 188 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 188 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 189 # cat f | 189 # cat f |
| 190 revision 1 | 190 revision 1 |
| 191 space | 191 space |
| 192 # hg stat | 192 # hg stat |
| 193 M f | 193 M f |
| 202 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool | 202 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool |
| 203 couldn't find merge tool true specified for f | 203 couldn't find merge tool true specified for f |
| 204 merging f | 204 merging f |
| 205 merging f failed! | 205 merging f failed! |
| 206 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 206 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 207 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 207 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 208 # cat f | 208 # cat f |
| 209 revision 1 | 209 revision 1 |
| 210 space | 210 space |
| 211 # hg stat | 211 # hg stat |
| 212 M f | 212 M f |
| 221 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool | 221 # hg merge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool |
| 222 couldn't find merge tool true specified for f | 222 couldn't find merge tool true specified for f |
| 223 merging f | 223 merging f |
| 224 merging f failed! | 224 merging f failed! |
| 225 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 225 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 226 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 226 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 227 # cat f | 227 # cat f |
| 228 revision 1 | 228 revision 1 |
| 229 space | 229 space |
| 230 # hg stat | 230 # hg stat |
| 231 M f | 231 M f |
| 242 # hg update -C 1 | 242 # hg update -C 1 |
| 243 # hg merge -r 2 --config ui.merge=false | 243 # hg merge -r 2 --config ui.merge=false |
| 244 merging f | 244 merging f |
| 245 merging f failed! | 245 merging f failed! |
| 246 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 246 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 247 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 247 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 248 # cat f | 248 # cat f |
| 249 revision 1 | 249 revision 1 |
| 250 space | 250 space |
| 251 # hg stat | 251 # hg stat |
| 252 M f | 252 M f |
| 258 true.priority=1 | 258 true.priority=1 |
| 259 true.executable=cat | 259 true.executable=cat |
| 260 # hg update -C 1 | 260 # hg update -C 1 |
| 261 # hg merge -r 2 --config ui.merge=internal:fail | 261 # hg merge -r 2 --config ui.merge=internal:fail |
| 262 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 262 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 263 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 263 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 264 # cat f | 264 # cat f |
| 265 revision 1 | 265 revision 1 |
| 266 space | 266 space |
| 267 # hg stat | 267 # hg stat |
| 268 M f | 268 M f |
| 321 true.executable=cat | 321 true.executable=cat |
| 322 # hg update -C 1 | 322 # hg update -C 1 |
| 323 # hg merge -r 2 --config ui.merge=internal:dump | 323 # hg merge -r 2 --config ui.merge=internal:dump |
| 324 merging f | 324 merging f |
| 325 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 325 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 326 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 326 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 327 # cat f | 327 # cat f |
| 328 revision 1 | 328 revision 1 |
| 329 space | 329 space |
| 330 # hg stat | 330 # hg stat |
| 331 M f | 331 M f |
| 352 # hg update -C 1 | 352 # hg update -C 1 |
| 353 # hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false | 353 # hg merge -r 2 --config ui.merge=internal:other --config merge-patterns.f=false |
| 354 merging f | 354 merging f |
| 355 merging f failed! | 355 merging f failed! |
| 356 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 356 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 357 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 357 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 358 # cat f | 358 # cat f |
| 359 revision 1 | 359 revision 1 |
| 360 space | 360 space |
| 361 # hg stat | 361 # hg stat |
| 362 M f | 362 M f |
| 516 merging f | 516 merging f |
| 517 output file f appears unchanged | 517 output file f appears unchanged |
| 518 was merge successful (yn)? n | 518 was merge successful (yn)? n |
| 519 merging f failed! | 519 merging f failed! |
| 520 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 520 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 521 use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon | 521 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
| 522 # cat f | 522 # cat f |
| 523 revision 1 | 523 revision 1 |
| 524 space | 524 space |
| 525 # hg stat | 525 # hg stat |
| 526 M f | 526 M f |
| 527 ? f.orig | 527 ? f.orig |
| 528 | 528 |