mercurial: tests/test-histedit-fold-non-commute.t@37ab9e20991c (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	> histedit=
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	6	> EOF
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	7
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	8	$ modwithdate ()
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	9	> {
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	10	> echo $1 > $1
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	11	> hg ci -m $1 -d "$2 0"
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	12	> }
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	13
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	14	$ initrepo ()
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	15	> {
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	16	> hg init $1
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	17	> cd $1
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	18	> for x in a b c d e f ; do
17646 d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	19	> echo $x$x$x$x$x > $x
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	20	> hg add $x
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	21	> done
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	22	> hg ci -m 'Initial commit'
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	23	> modwithdate a 1
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	24	> modwithdate b 2
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	25	> modwithdate c 3
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	26	> modwithdate d 4
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	27	> modwithdate e 5
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	28	> modwithdate f 6
17646 d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	29	> echo 'I can haz no commute' > e
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	30	> hg ci -m 'does not commute with e' -d '7 0'
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	31	> cd ..
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	32	> }
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	33
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	34	$ initrepo r
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	35	$ cd r
17646 d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	36	Initial generation of the command files
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	37
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	38	$ EDITED="$TESTTMP/editedhistory"
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	39	$ hg log --template 'pick {node\|short} {rev} {desc}\n' -r 3 >> $EDITED
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	40	$ hg log --template 'pick {node\|short} {rev} {desc}\n' -r 4 >> $EDITED
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	41	$ hg log --template 'fold {node\|short} {rev} {desc}\n' -r 7 >> $EDITED
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	42	$ hg log --template 'pick {node\|short} {rev} {desc}\n' -r 5 >> $EDITED
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	43	$ hg log --template 'pick {node\|short} {rev} {desc}\n' -r 6 >> $EDITED
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	44	$ cat $EDITED
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	45	pick 092e4ce14829 3 c
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	46	pick ae78f4c9d74f 4 d
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	47	fold 42abbb61bede 7 does not commute with e
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	48	pick 7f3755409b00 5 e
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	49	pick dd184f2faeb0 6 f
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	50
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	51	log before edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	52	$ hg log --graph
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	53	@ changeset: 7:42abbb61bede
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	54	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	55	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	56	\| date: Thu Jan 01 00:00:07 1970 +0000
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	57	\| summary: does not commute with e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	58	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	59	o changeset: 6:dd184f2faeb0
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	60	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	61	\| date: Thu Jan 01 00:00:06 1970 +0000
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	62	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	63	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	64	o changeset: 5:7f3755409b00
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	65	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	66	\| date: Thu Jan 01 00:00:05 1970 +0000
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	67	\| summary: e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	68	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	69	o changeset: 4:ae78f4c9d74f
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	70	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	71	\| date: Thu Jan 01 00:00:04 1970 +0000
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	72	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	73	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	74	o changeset: 3:092e4ce14829
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	75	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	76	\| date: Thu Jan 01 00:00:03 1970 +0000
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	77	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	78	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	79	o changeset: 2:40ccdd8beb95
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	80	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	81	\| date: Thu Jan 01 00:00:02 1970 +0000
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	82	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	83	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	84	o changeset: 1:cd997a145b29
17646 d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	85	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	86	\| date: Thu Jan 01 00:00:01 1970 +0000
17646 d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	87	\| summary: a
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	88	\|
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	89	o changeset: 0:1715188a53c7
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	90	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	91	date: Thu Jan 01 00:00:00 1970 +0000
17646 d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	92	summary: Initial commit
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	93
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	94
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	95	edit the history
19019 53060cc1b601 histedit-test: generalise --commands "-" usage Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18934 diff changeset	96	$ hg histedit 3 --commands $EDITED 2>&1 \| fixbundle
17646 d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	97	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17646 diff changeset	98	merging e
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 24767 diff changeset	99	warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	100	Fix up the change (fold 42abbb61bede)
27629 e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	101	(hg histedit --continue to resume)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	102
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	103	fix up
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17646 diff changeset	104	$ echo 'I can haz no commute' > e
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17646 diff changeset	105	$ hg resolve --mark e
21947 b081decd9062 resolve: add parenthesis around "no more unresolved files" message Pierre-Yves David <pierre-yves.david@fb.com> parents: 21267 diff changeset	106	(no more unresolved files)
27627 dcbba68e076f histedit: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27406 diff changeset	107	continue: hg histedit --continue
28339 67fa77e40702 tests: replace cat.py with cat in test-histedit-fold-non-commute.t timeless <timeless@mozdev.org> parents: 28004 diff changeset	108	$ HGEDITOR=cat hg histedit --continue 2>&1 \| fixbundle \| grep -v '2 files removed'
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	109	d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	110	***
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	111	does not commute with e
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
17241 c2f13180001f histedit: end folding message with an LF Patrick Mezard <patrick@mezard.eu> parents: 17087 diff changeset	114
17644 9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17241 diff changeset	115	HG: Enter commit message. Lines beginning with 'HG:' are removed.
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17241 diff changeset	116	HG: Leave message empty to abort commit.
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17241 diff changeset	117	HG: --
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17241 diff changeset	118	HG: user: test
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17241 diff changeset	119	HG: branch 'default'
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17241 diff changeset	120	HG: changed d
9ae073f10572 histedit: fold in memory Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17241 diff changeset	121	HG: changed e
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17646 diff changeset	122	merging e
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 24767 diff changeset	123	warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	124	Fix up the change (pick 7f3755409b00)
27629 e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	125	(hg histedit --continue to resume)
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	126
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	127	just continue this time
28340 c100dbd593e2 histedit: reword message when a changeset produces no changes timeless <timeless@mozdev.org> parents: 28339 diff changeset	128	keep the non-commuting change, and thus the pending change will be dropped
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17646 diff changeset	129	$ hg revert -r 'p1()' e
d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17646 diff changeset	130	$ hg resolve --mark e
21947 b081decd9062 resolve: add parenthesis around "no more unresolved files" message Pierre-Yves David <pierre-yves.david@fb.com> parents: 21267 diff changeset	131	(no more unresolved files)
27627 dcbba68e076f histedit: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27406 diff changeset	132	continue: hg histedit --continue
28340 c100dbd593e2 histedit: reword message when a changeset produces no changes timeless <timeless@mozdev.org> parents: 28339 diff changeset	133	$ hg diff
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	134	$ hg histedit --continue 2>&1 \| fixbundle
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	135	7f3755409b00: skipping changeset (no changes)
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	136
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	137	log after edit
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	138	$ hg log --graph
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	139	@ changeset: 5:1300355b1a54
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	140	\| tag: tip
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	141	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	142	\| date: Thu Jan 01 00:00:06 1970 +0000
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	143	\| summary: f
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	144	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	145	o changeset: 4:e2ac33269083
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	146	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	147	\| date: Thu Jan 01 00:00:07 1970 +0000
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	148	\| summary: d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	149	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	150	o changeset: 3:092e4ce14829
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	151	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	152	\| date: Thu Jan 01 00:00:03 1970 +0000
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	153	\| summary: c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	154	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	155	o changeset: 2:40ccdd8beb95
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	156	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	157	\| date: Thu Jan 01 00:00:02 1970 +0000
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	158	\| summary: b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	159	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	160	o changeset: 1:cd997a145b29
17646 d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	161	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	162	\| date: Thu Jan 01 00:00:01 1970 +0000
17646 d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	163	\| summary: a
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	164	\|
d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	165	o changeset: 0:1715188a53c7
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	166	user: test
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	167	date: Thu Jan 01 00:00:00 1970 +0000
17646 d44731a3adb8 histedit-test: ensure that non commute test will never commute Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17644 diff changeset	168	summary: Initial commit
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	169
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	170
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	171	contents of e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	172	$ hg cat e
17647 d34ba4991188 histedit: replaces patching logic by merges Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 17646 diff changeset	173	I can haz no commute
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	174
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	175	manifest
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	176	$ hg manifest
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	177	a
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	178	b
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	179	c
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	180	d
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	181	e
35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	182	f
17064 168cc52ad7c2 histedit: new extension for interactive history editing Augie Fackler <raf@durin42.com> parents: diff changeset	183
17085 35729bdd59b6 tests: convert histedit tests to .t Mads Kiilerich <mads@kiilerich.com> parents: 17064 diff changeset	184	$ cd ..
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	185
31056 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31055 diff changeset	186	Repeat test using "roll", not "fold". "roll" folds in changes but drops message and date
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	187
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	188	$ initrepo r2
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	189	$ cd r2
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	190
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	191	Initial generation of the command files
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	192
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	193	$ EDITED="$TESTTMP/editedhistory.2"
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	194	$ hg log --template 'pick {node\|short} {rev} {desc}\n' -r 3 >> $EDITED
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	195	$ hg log --template 'pick {node\|short} {rev} {desc}\n' -r 4 >> $EDITED
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	196	$ hg log --template 'roll {node\|short} {rev} {desc}\n' -r 7 >> $EDITED
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	197	$ hg log --template 'pick {node\|short} {rev} {desc}\n' -r 5 >> $EDITED
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	198	$ hg log --template 'pick {node\|short} {rev} {desc}\n' -r 6 >> $EDITED
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	199	$ cat $EDITED
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	200	pick 092e4ce14829 3 c
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	201	pick ae78f4c9d74f 4 d
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	202	roll 42abbb61bede 7 does not commute with e
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	203	pick 7f3755409b00 5 e
f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	204	pick dd184f2faeb0 6 f
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	205
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	206	log before edit
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	207	$ hg log --graph
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	208	@ changeset: 7:42abbb61bede
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	209	\| tag: tip
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	210	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	211	\| date: Thu Jan 01 00:00:07 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	212	\| summary: does not commute with e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	213	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	214	o changeset: 6:dd184f2faeb0
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	215	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	216	\| date: Thu Jan 01 00:00:06 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	217	\| summary: f
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	218	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	219	o changeset: 5:7f3755409b00
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	220	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	221	\| date: Thu Jan 01 00:00:05 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	222	\| summary: e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	223	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	224	o changeset: 4:ae78f4c9d74f
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	225	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	226	\| date: Thu Jan 01 00:00:04 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	227	\| summary: d
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	228	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	229	o changeset: 3:092e4ce14829
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	230	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	231	\| date: Thu Jan 01 00:00:03 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	232	\| summary: c
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	233	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	234	o changeset: 2:40ccdd8beb95
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	235	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	236	\| date: Thu Jan 01 00:00:02 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	237	\| summary: b
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	238	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	239	o changeset: 1:cd997a145b29
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	240	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	241	\| date: Thu Jan 01 00:00:01 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	242	\| summary: a
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	243	\|
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	244	o changeset: 0:1715188a53c7
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	245	user: test
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	246	date: Thu Jan 01 00:00:00 1970 +0000
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	247	summary: Initial commit
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	248
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	249
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	250	edit the history
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	251	$ hg histedit 3 --commands $EDITED 2>&1 \| fixbundle
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	252	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	253	merging e
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 24767 diff changeset	254	warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	255	Fix up the change (roll 42abbb61bede)
27629 e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	256	(hg histedit --continue to resume)
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	257
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	258	fix up
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	259	$ echo 'I can haz no commute' > e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	260	$ hg resolve --mark e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	261	(no more unresolved files)
27627 dcbba68e076f histedit: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27406 diff changeset	262	continue: hg histedit --continue
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	263	$ hg histedit --continue 2>&1 \| fixbundle \| grep -v '2 files removed'
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	264	merging e
26614 ef1eb6df7071 simplemerge: move conflict warning message to filemerge Siddharth Agarwal <sid0@fb.com> parents: 24767 diff changeset	265	warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	266	Fix up the change (pick 7f3755409b00)
27629 e7ff83b2bcfe histedit: list action when intervention is required timeless <timeless@mozdev.org> parents: 27627 diff changeset	267	(hg histedit --continue to resume)
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	268
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	269	just continue this time
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	270	$ hg revert -r 'p1()' e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	271	$ hg resolve --mark e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	272	(no more unresolved files)
27627 dcbba68e076f histedit: hook afterresolvedstates timeless <timeless@mozdev.org> parents: 27406 diff changeset	273	continue: hg histedit --continue
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	274	$ hg histedit --continue 2>&1 \| fixbundle
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	275	7f3755409b00: skipping changeset (no changes)
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	276
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	277	log after edit
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	278	$ hg log --graph
31056 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31055 diff changeset	279	@ changeset: 5:b538bcb461be
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	280	\| tag: tip
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	281	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	282	\| date: Thu Jan 01 00:00:06 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	283	\| summary: f
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	284	\|
31056 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31055 diff changeset	285	o changeset: 4:317e37cb6d66
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	286	\| user: test
31056 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31055 diff changeset	287	\| date: Thu Jan 01 00:00:04 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	288	\| summary: d
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	289	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	290	o changeset: 3:092e4ce14829
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	291	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	292	\| date: Thu Jan 01 00:00:03 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	293	\| summary: c
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	294	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	295	o changeset: 2:40ccdd8beb95
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	296	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	297	\| date: Thu Jan 01 00:00:02 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	298	\| summary: b
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	299	\|
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	300	o changeset: 1:cd997a145b29
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	301	\| user: test
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	302	\| date: Thu Jan 01 00:00:01 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	303	\| summary: a
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	304	\|
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	305	o changeset: 0:1715188a53c7
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	306	user: test
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	307	date: Thu Jan 01 00:00:00 1970 +0000
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	308	summary: Initial commit
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	309
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	310
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	311	contents of e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	312	$ hg cat e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	313	I can haz no commute
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	314
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	315	manifest
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	316	$ hg manifest
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	317	a
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	318	b
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	319	c
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	320	d
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	321	e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	322	f
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	323
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	324	description is taken from rollup target commit
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	325
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	326	$ hg log --debug --rev 4
31056 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31055 diff changeset	327	changeset: 4:317e37cb6d66c1c84628c00e5bf4c8c292831951
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	328	phase: draft
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	329	parent: 3:092e4ce14829f4974399ce4316d59f64ef0b6725
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	330	parent: -1:0000000000000000000000000000000000000000
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	331	manifest: 4:b068a323d969f22af1296ec6a5ea9384cef437ac
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	332	user: test
31056 37ab9e20991c histedit: modify rollup to discard date from the rollup commit (issue4820) Ben Schmidt <insightfuls@users.noreply.github.com> parents: 31055 diff changeset	333	date: Thu Jan 01 00:00:04 1970 +0000
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	334	files: d e
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	335	extra: branch=default
31055 f1b63ec4b987 histedit: improve documentation and behaviour of dates Ben Schmidt <insightfuls@users.noreply.github.com> parents: 28340 diff changeset	336	extra: histedit_source=ae78f4c9d74ffa4b6cb5045001c303fe9204e890,42abbb61bede6f4366fa1e74a664343e5d558a70
22152 d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	337	description:
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	338	d
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	339
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	340
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	341
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	342	done with repo r2
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	343
d2a5986cb89d histedit: add "roll" command to fold commit data and drop message (issue4256) Mike Edgar <adgar@google.com> parents: 21947 diff changeset	344	$ cd ..

author	Ben Schmidt <insightfuls@users.noreply.github.com>
	Sat, 18 Feb 2017 21:30:28 +1100
changeset 31056	37ab9e20991c
parent 31055	f1b63ec4b987
child 42052	15d2afa31e57
permissions	-rw-r--r--