mercurial: tests/test-histedit-non-commute.t@5f2cacb715dc (annotated)

17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	1	$ . "$TESTDIR/histedit-helpers.sh"
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	2
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	3	$ cat >> $HGRCPATH <<EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	4	> [extensions]
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	5	> graphlog=
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	6	> histedit=
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	7	> EOF
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	8
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	9	$ EDITED=`pwd`/editedhistory
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	10	$ cat > $EDITED <<EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	11	> pick 177f92b77385 c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	12	> pick 055a42cdd887 d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	13	> pick bfa474341cc9 does not commute with e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	14	> pick e860deea161a e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	15	> pick 652413bf663e f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	16	> EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	17	$ initrepo ()
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	18	> {
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	19	> hg init $1
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	20	> cd $1
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	21	> for x in a b c d e f ; do
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	22	> echo $x > $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	23	> hg add $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	24	> hg ci -m $x
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	25	> done
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	26	> echo a >> e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	27	> hg ci -m 'does not commute with e'
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	28	> cd ..
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	29	> }
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	30
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	31	$ initrepo r1
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	32	$ cd r1
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	33
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	34	log before edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	35	$ hg log --graph
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	36	@ changeset: 6:bfa474341cc9
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	37	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	38	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	39	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	40	\| summary: does not commute with e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	41	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	42	o changeset: 5:652413bf663e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	43	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	44	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	45	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	46	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	47	o changeset: 4:e860deea161a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	48	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	49	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	50	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	51	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	52	o changeset: 3:055a42cdd887
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	53	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	54	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	55	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	56	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	57	o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	58	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	59	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	60	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	61	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	62	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	63	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	64	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	65	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	66	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	67	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	68	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	69	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	70	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	71
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	72
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	73	edit the history
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	74	$ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 \| fixbundle
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	75	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	76	1 out of 1 hunks FAILED -- saving rejects to file e.rej
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	77	abort: Fix up the change and run hg histedit --continue
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	78
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	79	abort the edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	80	$ hg histedit --abort 2>&1 \| fixbundle
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	81	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	82
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	83
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	84	second edit set
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	85
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	86	$ hg log --graph
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	87	@ changeset: 6:bfa474341cc9
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	88	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	89	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	90	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	91	\| summary: does not commute with e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	92	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	93	o changeset: 5:652413bf663e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	94	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	95	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	96	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	97	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	98	o changeset: 4:e860deea161a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	99	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	100	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	101	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	102	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	103	o changeset: 3:055a42cdd887
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	104	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	105	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	106	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	107	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	108	o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	109	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	110	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	111	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	112	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	113	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	114	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	115	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	116	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	117	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	118	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	119	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	120	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	121	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	122
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	123
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	124	edit the history
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	125	$ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 \| fixbundle
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	126	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	127	1 out of 1 hunks FAILED -- saving rejects to file e.rej
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	128	abort: Fix up the change and run hg histedit --continue
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	129
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	130	fix up
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	131	$ echo a > e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	132	$ hg add e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	133	$ hg histedit --continue 2>&1 \| fixbundle
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	134	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	135	file e already exists
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	136	1 out of 1 hunks FAILED -- saving rejects to file e.rej
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	137	abort: Fix up the change and run hg histedit --continue
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	138
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	139	just continue this time
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	140	$ hg histedit --continue 2>&1 \| fixbundle
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	141	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	142	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	143
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	144	log after edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	145	$ hg log --graph
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	146	@ changeset: 5:9ab84894b459
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	147	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	148	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	149	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	150	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	151	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	152	o changeset: 4:1fff3ae8199d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	153	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	154	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	155	\| summary: does not commute with e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	156	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	157	o changeset: 3:055a42cdd887
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	158	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	159	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	160	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	161	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	162	o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	163	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	164	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	165	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	166	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	167	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	168	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	169	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	170	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	171	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	172	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	173	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	174	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	175	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	176
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	177
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	178	start over
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	179
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	180	$ cd ..
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	181
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	182	$ initrepo r2
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	183	$ cd r2
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	184	$ cat > $EDITED <<EOF
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	185	> pick 177f92b77385 c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	186	> pick 055a42cdd887 d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	187	> mess bfa474341cc9 does not commute with e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	188	> pick e860deea161a e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	189	> pick 652413bf663e f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	190	> EOF
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	191
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	192	edit the history, this time with a fold action
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	193	$ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 \| fixbundle
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	194	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	195	1 out of 1 hunks FAILED -- saving rejects to file e.rej
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	196	abort: Fix up the change and run hg histedit --continue
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	197
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	198	$ echo a > e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	199	$ hg add e
17086 5f2cacb715dc tests: make histedit tests more resilient to filesystem variation Mads Kiilerich <mads@kiilerich.com> parents: 17085 diff changeset	200	$ HGEDITOR="cat \"$EDITED\" > " hg histedit --continue 2>&1 \| fixbundle
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	201	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	202	file e already exists
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	203	1 out of 1 hunks FAILED -- saving rejects to file e.rej
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	204	abort: Fix up the change and run hg histedit --continue
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	205	second edit also fails, but just continue
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	206	$ hg histedit --continue 2>&1 \| fixbundle
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	207	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	208	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	209
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	210	post message fix
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	211	$ hg log --graph
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	212	@ changeset: 5:6459970fb49b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	213	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	214	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	215	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	216	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	217	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	218	o changeset: 4:556f27c874b0
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	219	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	220	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	221	\| summary: pick 177f92b77385 c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	222	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	223	o changeset: 3:055a42cdd887
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	224	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	225	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	226	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	227	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	228	o changeset: 2:177f92b77385
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	229	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	230	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	231	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	232	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	233	o changeset: 1:d2ae7f538514
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	234	\| user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	235	\| date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	236	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	237	\|
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	238	o changeset: 0:cb9a9f314b8b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	239	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	240	date: Thu Jan 01 00:00:00 1970 +0000
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	241	summary: a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	242
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	243
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	244	$ cd ..

author	Mads Kiilerich <mads@kiilerich.com>
	Sat, 30 Jun 2012 03:34:50 +0200
changeset 17086	5f2cacb715dc
parent 17085	35729bdd59b6
child 17087	a79776f427b4
permissions	-rw-r--r--