mercurial: tests/test-rebase-mq-skip.t@19d6fec60b81 (annotated)

12785 c7d23b4ca4ba check-code: warning and fixes for whitespace in unified tests Matt Mackall <mpm@selenic.com> parents: 12640 diff changeset	1	This emulates the effects of an hg pull --rebase in which the remote repo
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	2	already has one local mq patch
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	3
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	4	$ cat >> $HGRCPATH <<EOF
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	5	> [extensions]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	6	> rebase=
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	7	> mq=
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	8	>
15742 65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 12896 diff changeset	9	> [phases]
65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 12896 diff changeset	10	> publish=False
65df60a3f96b phases: prevent rebase to rebase immutable changeset. Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 12896 diff changeset	11	>
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	12	> [alias]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	13	> tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n"
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	14	> EOF
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	15
11198 b345b1cc124f rebase: use helpers.sh in tests Matt Mackall <mpm@selenic.com> parents: 8168 diff changeset	16
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	17	$ hg init a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	18	$ cd a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	19	$ hg qinit -c
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	20
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	21	$ echo c1 > c1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	22	$ hg add c1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	23	$ hg ci -m C1
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	24
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	25	$ echo r1 > r1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	26	$ hg add r1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	27	$ hg ci -m R1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	28
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	29	$ hg up -q 0
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	30
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	31	$ hg qnew p0.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	32	$ echo p0 > p0
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	33	$ hg add p0
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	34	$ hg qref -m P0
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	35
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	36	$ hg qnew p1.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	37	$ echo p1 > p1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	38	$ hg add p1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	39	$ hg qref -m P1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	40
17345 4f8054d3171b check-code: fix check for trailing whitespace on sh command lines Mads Kiilerich <mads@kiilerich.com> parents: 16913 diff changeset	41	$ hg export qtip > p1.patch
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	42
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	43	$ hg up -q -C 1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	44
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	45	$ hg import p1.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	46	applying p1.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	47
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	48	$ rm p1.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	49
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	50	$ hg up -q -C qtip
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	51
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	52	$ hg rebase
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12608 diff changeset	53	saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	54
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	55	$ hg tglog
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	56	@ 3: 'P0' tags: p0.patch qbase qtip tip
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	57	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	58	o 2: 'P1' tags: qparent
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	59	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	60	o 1: 'R1' tags:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	61	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	62	o 0: 'C1' tags:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	63
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	64	$ cd ..
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	65
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	66
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	67	$ hg init b
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	68	$ cd b
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	69	$ hg qinit -c
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	70
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	71	$ for i in r0 r1 r2 r3 r4 r5 r6;
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	72	> do
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	73	> echo $i > $i
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	74	> hg ci -Am $i
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	75	> done
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	76	adding r0
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	77	adding r1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	78	adding r2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	79	adding r3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	80	adding r4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	81	adding r5
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	82	adding r6
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	83
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	84	$ hg qimport -r 1:tip
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	85
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	86	$ hg up -q 0
11843 00f8e7837668 rebase: recompute the set of skipped rev when using --continue (issue2330) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11208 diff changeset	87
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	88	$ for i in r1 r3 r7 r8;
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	89	> do
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	90	> echo $i > $i
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	91	> hg ci -Am branch2-$i
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	92	> done
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	93	adding r1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	94	created new head
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	95	adding r3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	96	adding r7
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	97	adding r8
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	98
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	99	$ echo somethingelse > r4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	100	$ hg ci -Am branch2-r4
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	101	adding r4
11843 00f8e7837668 rebase: recompute the set of skipped rev when using --continue (issue2330) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11208 diff changeset	102
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	103	$ echo r6 > r6
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	104	$ hg ci -Am branch2-r6
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	105	adding r6
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	106
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	107	$ hg up -q qtip
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	108
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	109	$ HGMERGE=internal:fail hg rebase
18933 42b620fc89e2 rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc) Augie Fackler <raf@durin42.com> parents: 17345 diff changeset	110	unresolved conflicts (see hg resolve, then hg rebase --continue)
18935 e5d9441ec281 dispatch: exit with status 1 for an InterventionRequired exception (bc) Augie Fackler <raf@durin42.com> parents: 18933 diff changeset	111	[1]
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	112
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	113	$ HGMERGE=internal:local hg resolve --all
21266 19d6fec60b81 resolve: print message when no unresolved files remain (issue4214) Gregory Szorc <gregory.szorc@gmail.com> parents: 20117 diff changeset	114	no unresolved files; you may continue your unfinished operation
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	115
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	116	$ hg rebase --continue
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12608 diff changeset	117	saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
11843 00f8e7837668 rebase: recompute the set of skipped rev when using --continue (issue2330) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 11208 diff changeset	118
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	119	$ hg tglog
16509 eab9119c5dee rebase: skip resolved but emptied revisions Patrick Mezard <patrick@mezard.eu> parents: 16508 diff changeset	120	@ 8: 'r5' tags: 5.diff qtip tip
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	121	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	122	o 7: 'r2' tags: 2.diff qbase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	123	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	124	o 6: 'branch2-r6' tags: qparent
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	125	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	126	o 5: 'branch2-r4' tags:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	127	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	128	o 4: 'branch2-r8' tags:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	129	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	130	o 3: 'branch2-r7' tags:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	131	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	132	o 2: 'branch2-r3' tags:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	133	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	134	o 1: 'branch2-r1' tags:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	135	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	136	o 0: 'r0' tags:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11843 diff changeset	137
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16509 diff changeset	138
f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16509 diff changeset	139	$ cd ..

author	Gregory Szorc <gregory.szorc@gmail.com>
	Fri, 18 Apr 2014 22:19:25 -0700
changeset 21266	19d6fec60b81
parent 20117	aa9385f983fa
child 21267	e4f451c8c05c
permissions	-rw-r--r--