test-histedit-drop.t
174 lines
| 4.2 KiB
| text/troff
|
Tads3Lexer
/ tests / test-histedit-drop.t
|
r17085 | $ . "$TESTDIR/histedit-helpers.sh" | ||
$ cat >> $HGRCPATH <<EOF | ||||
> [extensions] | ||||
> histedit= | ||||
> EOF | ||||
$ initrepo () | ||||
> { | ||||
> hg init r | ||||
> cd r | ||||
> for x in a b c d e f ; do | ||||
> echo $x > $x | ||||
> hg add $x | ||||
> hg ci -m $x | ||||
> done | ||||
> } | ||||
$ initrepo | ||||
log before edit | ||||
$ hg log --graph | ||||
@ changeset: 5:652413bf663e | ||||
| tag: tip | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: f | ||||
| | ||||
o changeset: 4:e860deea161a | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: e | ||||
| | ||||
o changeset: 3:055a42cdd887 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: d | ||||
| | ||||
o changeset: 2:177f92b77385 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: c | ||||
| | ||||
o changeset: 1:d2ae7f538514 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: b | ||||
| | ||||
o changeset: 0:cb9a9f314b8b | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
edit the history | ||||
|
r19019 | $ hg histedit 177f92b77385 --commands - 2>&1 << EOF | fixbundle | ||
> drop 177f92b77385 c | ||||
> pick e860deea161a e | ||||
> pick 652413bf663e f | ||||
> pick 055a42cdd887 d | ||||
> EOF | ||||
|
r17085 | |||
log after edit | ||||
$ hg log --graph | ||||
|
r18437 | @ changeset: 4:f518305ce889 | ||
|
r17085 | | tag: tip | ||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: d | ||||
| | ||||
|
r18437 | o changeset: 3:a4f7421b80f7 | ||
|
r17085 | | user: test | ||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: f | ||||
| | ||||
|
r18437 | o changeset: 2:ee283cb5f2d5 | ||
|
r17085 | | user: test | ||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: e | ||||
| | ||||
o changeset: 1:d2ae7f538514 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: b | ||||
| | ||||
o changeset: 0:cb9a9f314b8b | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
|
r18437 | Check histedit_source | ||
$ hg log --debug --rev f518305ce889 | ||||
changeset: 4:f518305ce889c07cb5bd05522176d75590ef3324 | ||||
tag: tip | ||||
phase: draft | ||||
parent: 3:a4f7421b80f79fcc59fff01bcbf4a53d127dd6d3 | ||||
parent: -1:0000000000000000000000000000000000000000 | ||||
manifest: 4:d3d4f51c157ff242c32ff745d4799aaa26ccda44 | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
files+: d | ||||
extra: branch=default | ||||
extra: histedit_source=055a42cdd88768532f9cf79daa407fc8d138de9b | ||||
description: | ||||
d | ||||
|
r17085 | manifest after edit | ||
$ hg manifest | ||||
a | ||||
b | ||||
d | ||||
e | ||||
f | ||||
|
r18509 | Drop the last changeset | ||
|
r19019 | $ hg histedit ee283cb5f2d5 --commands - 2>&1 << EOF | fixbundle | ||
|
r18509 | > pick ee283cb5f2d5 e | ||
> pick a4f7421b80f7 f | ||||
> drop f518305ce889 d | ||||
> EOF | ||||
$ hg log --graph | ||||
@ changeset: 3:a4f7421b80f7 | ||||
| tag: tip | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: f | ||||
| | ||||
o changeset: 2:ee283cb5f2d5 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: e | ||||
| | ||||
o changeset: 1:d2ae7f538514 | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: b | ||||
| | ||||
o changeset: 0:cb9a9f314b8b | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||
|
r27414 | $ hg histedit cb9a9f314b8b --commands - 2>&1 << EOF | fixbundle | ||
> pick cb9a9f314b8b a | ||||
> pick ee283cb5f2d5 e | ||||
> EOF | ||||
|
r27545 | hg: parse error: missing rules for changeset a4f7421b80f7 | ||
|
r29970 | (use "drop a4f7421b80f7" to discard, see also: 'hg help -e histedit.config') | ||
|
r27414 | $ hg --config histedit.dropmissing=True histedit cb9a9f314b8b --commands - 2>&1 << EOF | fixbundle | ||
|
r28519 | > EOF | ||
hg: parse error: no rules provided | ||||
(use strip extension to remove commits) | ||||
$ hg --config histedit.dropmissing=True histedit cb9a9f314b8b --commands - 2>&1 << EOF | fixbundle | ||||
|
r27414 | > pick cb9a9f314b8b a | ||
> pick ee283cb5f2d5 e | ||||
> EOF | ||||
$ hg log --graph | ||||
@ changeset: 1:e99c679bf03e | ||||
| tag: tip | ||||
| user: test | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: e | ||||
| | ||||
o changeset: 0:cb9a9f314b8b | ||||
user: test | ||||
date: Thu Jan 01 00:00:00 1970 +0000 | ||||
summary: a | ||||