equal
deleted
inserted
replaced
353 branch: branch2 |
353 branch: branch2 |
354 commit: 1 removed |
354 commit: 1 removed |
355 update: (current) |
355 update: (current) |
356 |
356 |
357 with --merge |
357 with --merge |
|
358 (this also tests that editor is invoked if '--edit' is specified |
|
359 explicitly regardless of '--message') |
|
360 |
358 $ hg update -qC |
361 $ hg update -qC |
359 $ hg backout --merge -d '3 0' -r 1 -m 'backout on branch1' --tool=true |
362 $ HGEDITOR=cat hg backout --merge -d '3 0' -r 1 -m 'backout on branch1' --tool=true --edit |
360 removing file1 |
363 removing file1 |
|
364 backout on branch1 |
|
365 |
|
366 |
|
367 HG: Enter commit message. Lines beginning with 'HG:' are removed. |
|
368 HG: Leave message empty to abort commit. |
|
369 HG: -- |
|
370 HG: user: test |
|
371 HG: branch 'branch2' |
|
372 HG: removed file1 |
361 created new head |
373 created new head |
362 changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3 |
374 changeset 3:d4e8f6db59fb backs out changeset 1:bf1602f437f3 |
363 merging with changeset 3:d4e8f6db59fb |
375 merging with changeset 3:d4e8f6db59fb |
364 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
376 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
365 (branch merge, don't forget to commit) |
377 (branch merge, don't forget to commit) |