mercurial: tests/test-rebase-mq.t@627e50e9e316 (annotated)

12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	1	$ cat >> $HGRCPATH <<EOF
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	2	> [extensions]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	3	> graphlog=
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	4	> rebase=
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	5	> mq=
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	6	>
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	7	> [mq]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	8	> plain=true
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	9	>
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	10	> [alias]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	11	> tglog = log -G --template "{rev}: '{desc}' tags: {tags}\n"
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	12	> EOF
11198 b345b1cc124f rebase: use helpers.sh in tests Matt Mackall <mpm@selenic.com> parents: 10672 diff changeset	13
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	14
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	15	$ hg init a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	16	$ cd a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	17	$ hg qinit -c
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	18
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	19	$ echo c1 > f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	20	$ hg add f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	21	$ hg ci -m C1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	22
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	23	$ echo r1 > f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	24	$ hg ci -m R1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	25
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	26	$ hg up -q 0
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 8168 diff changeset	27
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	28	$ hg qnew f.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	29	$ echo mq1 > f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	30	$ hg qref -m P0
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	31
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	32	$ hg qnew f2.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	33	$ echo mq2 > f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	34	$ hg qref -m P1
6931 02f4a0bcfdce test-rebase-mq: '\|' is a GNU sed extension, unfold it Patrick Mezard <pmezard@gmail.com> parents: 6906 diff changeset	35
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	36	$ hg tglog
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	37	@ 3: 'P1' tags: f2.patch qtip tip
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	38	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	39	o 2: 'P0' tags: f.patch qbase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	40	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	41	\| o 1: 'R1' tags:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	42	\|/
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	43	o 0: 'C1' tags: qparent
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	44
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	45
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	46	Rebase - try to rebase on an applied mq patch:
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	47
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	48	$ hg rebase -s 1 -d 3
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	49	abort: cannot rebase onto an applied mq patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	50	[255]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	51
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	52	Rebase - same thing, but mq patch is default dest:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	53
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	54	$ hg up -q 1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	55	$ hg rebase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	56	abort: cannot rebase onto an applied mq patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	57	[255]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	58	$ hg up -q qtip
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	59
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	60	Rebase - generate a conflict:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	61
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	62	$ hg rebase -s 2 -d 1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	63	merging f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	64	warning: conflicts during merge.
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	65	merging f failed!
12896 b19b4c1df066 rebase: improve resolve failure message Steve Borho <steve@borho.org> parents: 12640 diff changeset	66	abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	67	[255]
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	68
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	69	Fix the 1st conflict:
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: 11536 diff changeset	71	$ echo mq1r1 > f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	72	$ hg resolve -m f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	73	$ hg rebase -c
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	74	merging f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	75	warning: conflicts during merge.
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	76	merging f failed!
12896 b19b4c1df066 rebase: improve resolve failure message Steve Borho <steve@borho.org> parents: 12640 diff changeset	77	abort: unresolved conflicts (see hg resolve, then hg rebase --continue)
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	78	[255]
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	79
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	80	Fix the 2nd conflict:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	81
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	82	$ echo mq1r1mq2 > f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	83	$ hg resolve -m f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	84	$ hg rebase -c
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12608 diff changeset	85	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	86
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	87	$ hg tglog
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	88	@ 3: 'P1' tags: f2.patch qtip tip
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	89	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	90	o 2: 'P0' tags: f.patch qbase
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	91	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	92	o 1: 'R1' tags: qparent
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	93	\|
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	94	o 0: 'C1' tags:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	95
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	96	$ hg up -q qbase
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	97
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	98	$ cat f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	99	mq1r1
10672 c2e1e637d4da rebase: always check if rebasing onto an applied mq patch. Greg Ward <greg-hg@gerg.ca> parents: 10397 diff changeset	100
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	101	$ cat .hg/patches/f.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	102	# HG changeset patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	103	# User test
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	104	# Date ?????????? ? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	105	# Node ID ???????????????????????????????????????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	106	# Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	107	P0
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	108
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	109	diff -r bac9ed9960d8 -r ???????????? f (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	110	--- a/f Thu Jan 01 00:00:00 1970 +0000
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	111	+++ b/f ??? ??? ?? ??:??:?? ???? ????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	112	@@ -1,1 +1,1 @@
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	113	-r1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	114	+mq1r1
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	115
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	116	Update to qtip:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	117
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	118	$ hg up -q qtip
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	119
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	120	$ cat f
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	121	mq1r1mq2
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	122
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	123	$ cat .hg/patches/f2.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	124	# HG changeset patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	125	# User test
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	126	# Date ?????????? ? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	127	# Node ID ???????????????????????????????????????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	128	# Parent ???????????????????????????????????????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	129	P1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	130
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	131	diff -r ???????????? -r ???????????? f (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	132	--- a/f ??? ??? ?? ??:??:?? ???? ????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	133	+++ b/f ??? ??? ?? ??:??:?? ???? ????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	134	@@ -1,1 +1,1 @@
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	135	-mq1r1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	136	+mq1r1mq2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	137
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	138	Adding one git-style patch and one normal:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	139
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	140	$ hg qpop -a
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	141	popping f2.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	142	popping f.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	143	patch queue now empty
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	144
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	145	$ rm -fr .hg/patches
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	146	$ hg qinit -c
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	147
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	148	$ hg up -q 0
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	149
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	150	$ hg qnew --git f_git.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	151	$ echo mq1 > p
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	152	$ hg add p
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	153	$ hg qref --git -m 'P0 (git)'
6906 808f03f61ebe Add rebase extension Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: diff changeset	154
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	155	$ hg qnew f.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	156	$ echo mq2 > p
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	157	$ hg qref -m P1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	158	$ hg qci -m 'save patch state'
6931 02f4a0bcfdce test-rebase-mq: '\|' is a GNU sed extension, unfold it Patrick Mezard <pmezard@gmail.com> parents: 6906 diff changeset	159
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	160	$ hg qseries -s
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	161	f_git.patch: P0 (git)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	162	f.patch: P1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	163
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	164	$ hg -R .hg/patches manifest
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	165	.hgignore
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	166	f.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	167	f_git.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	168	series
7955 c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6931 diff changeset	169
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	170	$ cat .hg/patches/f_git.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	171	P0 (git)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	172
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	173	diff --git a/p b/p
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	174	new file mode 100644
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	175	--- /dev/null
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	176	+++ b/p
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	177	@@ -0,0 +1,1 @@
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	178	+mq1
7955 c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6931 diff changeset	179
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	180	$ cat .hg/patches/f.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	181	P1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	182
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	183	diff -r ???????????? p (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	184	--- a/p ??? ??? ?? ??:??:?? ???? ????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	185	+++ b/p ??? ??? ?? ??:??:?? ???? ????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	186	@@ -1,1 +1,1 @@
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	187	-mq1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	188	+mq2
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	189
7955 c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6931 diff changeset	190
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	191	Rebase the applied mq patches:
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	192
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	193	$ hg rebase -s 2 -d 1
12640 6cc4b14fb76b tests: remove redundant globs Mads Kiilerich <mads@kiilerich.com> parents: 12608 diff changeset	194	saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	195
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	196	$ hg qci -m 'save patch state'
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	197
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	198	$ hg qseries -s
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	199	f_git.patch: P0 (git)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	200	f.patch: P1
7955 c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6931 diff changeset	201
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	202	$ hg -R .hg/patches manifest
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	203	.hgignore
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	204	f.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	205	f_git.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	206	series
7955 c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6931 diff changeset	207
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	208	$ cat .hg/patches/f_git.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	209	# HG changeset patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	210	# User test
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	211	# Date ?????????? ? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	212	# Node ID ???????????????????????????????????????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	213	# Parent bac9ed9960d8992bcad75864a879fa76cadaf1b0
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	214	P0 (git)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	215
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	216	diff --git a/p b/p
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	217	new file mode 100644
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	218	--- /dev/null
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	219	+++ b/p
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	220	@@ -0,0 +1,1 @@
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	221	+mq1
7955 c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6931 diff changeset	222
12608 16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	223	$ cat .hg/patches/f.patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	224	# HG changeset patch
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	225	# User test
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	226	# Date ?????????? ? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	227	# Node ID ???????????????????????????????????????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	228	# Parent ???????????????????????????????????????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	229	P1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	230
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	231	diff -r ???????????? -r ???????????? p (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	232	--- a/p ??? ??? ?? ??:??:?? ???? ????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	233	+++ b/p ??? ??? ?? ??:??:?? ???? ????? (glob)
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	234	@@ -1,1 +1,1 @@
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	235	-mq1
16b854cb80f1 tests: unify test-rebase* Adrian Buehlmann <adrian@cadifra.com> parents: 11536 diff changeset	236	+mq2
7955 c3d4ff03ec72 rebase: keep original mq patch format (Issue1574) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6931 diff changeset	237
13766 627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	238
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	239	Rebase with guards
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	240
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	241	$ hg init foo
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	242	$ cd foo
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	243	$ echo a > a
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	244	$ hg ci -Am a
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	245	adding a
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	246
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	247	Create mq repo with guarded patches foo and bar:
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	248
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	249	$ hg qinit
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	250	$ hg qnew foo
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	251	$ hg qguard foo +baz
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	252	$ echo foo > foo
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	253	$ hg qref
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	254	$ hg qpop
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	255	popping foo
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	256	patch queue now empty
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	257
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	258	$ hg qnew bar
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	259	$ hg qguard bar +baz
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	260	$ echo bar > bar
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	261	$ hg qref
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	262
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	263	$ hg qguard -l
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	264	bar: +baz
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	265	foo: +baz
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	266
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	267	$ hg tglog
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	268	@ 1:* '[mq]: bar' tags: bar qbase qtip tip (glob)
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	269	\|
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	270	o 0:* 'a' tags: qparent (glob)
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	271
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	272	Create new head to rebase bar onto:
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	273
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	274	$ hg up -C 0
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	275	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	276	$ echo b > b
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	277	$ hg add b
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	278	$ hg ci -m b
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	279	created new head
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	280	$ hg up -C 1
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	281	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	282	$ echo a >> a
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	283	$ hg qref
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	284
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	285	$ hg tglog
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	286	@ 2:* '[mq]: bar' tags: bar qbase qtip tip (glob)
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	287	\|
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	288	\| o 1:* 'b' tags: (glob)
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	289	\|/
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	290	o 0:* 'a' tags: qparent (glob)
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	291
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	292
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	293	Rebase bar:
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	294
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	295	$ hg -q rebase -d 1
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	296
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	297	$ hg qguard -l
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	298	foo: +baz
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	299	bar: +baz
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	300
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	301	$ hg tglog
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	302	@ 2:* '[mq]: bar' tags: bar qbase qtip tip (glob)
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	303	\|
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	304	o 1:* 'b' tags: qparent (glob)
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	305	\|
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	306	o 0:* 'a' tags: (glob)
627e50e9e316 rebase: restore mq guards after rebasing (issue2107) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 12896 diff changeset	307

author	Stefano Tortarolo <stefano.tortarolo@gmail.com>
	Sat, 26 Mar 2011 13:05:17 +0100
changeset 13766	627e50e9e316
parent 12896	b19b4c1df066
child 14599	b28004513977
permissions	-rw-r--r--