mercurial: tests/test-mq-qrefresh.t@18b3869179f9 (annotated)

12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	1	$ echo "[extensions]" >> $HGRCPATH
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	2	$ echo "mq=" >> $HGRCPATH
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	3	$ echo "[diff]" >> $HGRCPATH
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	4	$ echo "nodates=1" >> $HGRCPATH
3136 f01efb4bc258 tests: add new test; test-mq-qrefresh Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	5
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	6	$ hg init a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	7	$ cd a
10397 8cb81d75730c mq: add parent node IDs to MQ patches on qrefresh/qnew Steve Losh <steve@stevelosh.com> parents: 10368 diff changeset	8
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	9	$ mkdir 1 2
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	10	$ echo 'base' > 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	11	$ echo 'base' > 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	12	$ hg ci -Ambase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	13	adding 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	14	adding 2/base
3136 f01efb4bc258 tests: add new test; test-mq-qrefresh Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	15
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	16	$ hg qnew -mmqbase mqbase
3136 f01efb4bc258 tests: add new test; test-mq-qrefresh Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	17
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	18	$ echo 'patched' > 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	19	$ echo 'patched' > 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	20	$ hg qrefresh
3136 f01efb4bc258 tests: add new test; test-mq-qrefresh Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	21
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	22	$ hg qdiff
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	23	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	24	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	25	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	26	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	27	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	28	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	29	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	30	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	31	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	32	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	33	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	34	+patched
3136 f01efb4bc258 tests: add new test; test-mq-qrefresh Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	35
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	36	$ hg qdiff .
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	37	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	38	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	39	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	40	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	41	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	42	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	43	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	44	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	45	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	46	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	47	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	48	+patched
3136 f01efb4bc258 tests: add new test; test-mq-qrefresh Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	49
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	50	$ cat .hg/patches/mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	51	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	52	# Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	53	mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	54
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	55	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	56	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	57	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	58	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	59	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	60	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	61	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	62	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	63	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	64	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	65	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	66	+patched
3136 f01efb4bc258 tests: add new test; test-mq-qrefresh Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	67
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	68	$ echo 'patched again' > base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	69	$ hg qrefresh 1
3136 f01efb4bc258 tests: add new test; test-mq-qrefresh Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	70
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	71	$ hg qdiff
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	72	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	73	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	74	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	75	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	76	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	77	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	78	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	79	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	80	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	81	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	82	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	83	+patched
3136 f01efb4bc258 tests: add new test; test-mq-qrefresh Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	84
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	85	$ hg qdiff .
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	86	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	87	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	88	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	89	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	90	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	91	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	92	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	93	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	94	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	95	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	96	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	97	+patched
7113 f7fc5f5ecd62 mq: Allow qrefresh --silent to take parameters Mads Kiilerich <mads@kiilerich.com> parents: 6801 diff changeset	98
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	99	$ cat .hg/patches/mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	100	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	101	# Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	102	mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	103
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	104	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	105	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	106	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	107	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	108	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	109	+patched
7113 f7fc5f5ecd62 mq: Allow qrefresh --silent to take parameters Mads Kiilerich <mads@kiilerich.com> parents: 6801 diff changeset	110
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	111	qrefresh . in subdir:
7113 f7fc5f5ecd62 mq: Allow qrefresh --silent to take parameters Mads Kiilerich <mads@kiilerich.com> parents: 6801 diff changeset	112
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	113	$ ( cd 1 ; hg qrefresh . )
7113 f7fc5f5ecd62 mq: Allow qrefresh --silent to take parameters Mads Kiilerich <mads@kiilerich.com> parents: 6801 diff changeset	114
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	115	$ hg qdiff
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	116	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	117	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	118	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	119	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	120	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	121	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	122	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	123	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	124	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	125	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	126	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	127	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	128
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	129	$ hg qdiff .
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	130	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	131	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	132	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	133	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	134	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	135	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	136	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	137	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	138	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	139	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	140	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	141	+patched
6801 71e339714586 mq: fix qrefresh losing copy information (issue 1134) Patrick Mezard <pmezard@gmail.com> parents: 3136 diff changeset	142
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	143	$ cat .hg/patches/mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	144	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	145	# Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	146	mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	147
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	148	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	149	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	150	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	151	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	152	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	153	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	154
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	155	qrefresh in hg-root again:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	156
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	157	$ hg qrefresh
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	158
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	159	$ hg qdiff
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	160	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	161	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	162	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	163	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	164	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	165	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	166	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	167	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	168	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	169	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	170	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	171	+patched
6801 71e339714586 mq: fix qrefresh losing copy information (issue 1134) Patrick Mezard <pmezard@gmail.com> parents: 3136 diff changeset	172
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	173	$ hg qdiff .
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	174	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	175	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	176	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	177	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	178	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	179	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	180	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	181	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	182	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	183	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	184	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	185	+patched
7566 5f7e3f17aece mq: drop copy records when refreshing regular patches (issue1441) Patrick Mezard <pmezard@gmail.com> parents: 7177 diff changeset	186
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	187	$ cat .hg/patches/mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	188	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	189	# Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	190	mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	191
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	192	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	193	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	194	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	195	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	196	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	197	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	198	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	199	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	200	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	201	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	202	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	203	+patched
10367 b8801b58bbd8 test-mq-qrefresh: test qrefresh when tip != qtip Patrick Mezard <pmezard@gmail.com> parents: 7566 diff changeset	204
b8801b58bbd8 test-mq-qrefresh: test qrefresh when tip != qtip Patrick Mezard <pmezard@gmail.com> parents: 7566 diff changeset	205
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	206	qrefresh --short tests:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	207
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	208	$ echo 'orphan' > orphanchild
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	209	$ hg add orphanchild
17492 973c2b0b403c spelling: nonexistent timeless@mozdev.org parents: 16913 diff changeset	210	$ hg qrefresh nonexistentfilename # clear patch
17906 e83c482c6c5f test-mq-qrefresh: adapt for Windows after 39b7052b217b Adrian Buehlmann <adrian@cadifra.com> parents: 17888 diff changeset	211	nonexistentfilename: * (glob)
17978 55b367bff8d2 test-mq-qrefresh: test that the patch at qtip is indeed empty Adrian Buehlmann <adrian@cadifra.com> parents: 17906 diff changeset	212	$ hg diff -c qtip
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	213	$ hg qrefresh --short 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	214	$ hg qrefresh --short 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	215
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	216	$ hg qdiff
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	217	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	218	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	219	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	220	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	221	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	222	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	223	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	224	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	225	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	226	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	227	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	228	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	229	diff -r e7af5904b465 orphanchild
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	230	--- /dev/null
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	231	+++ b/orphanchild
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	232	@@ -0,0 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	233	+orphan
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	234
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	235	$ cat .hg/patches/mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	236	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	237	# Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	238	mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	239
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	240	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	241	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	242	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	243	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	244	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	245	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	246	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	247	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	248	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	249	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	250	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	251	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	252
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	253	$ hg st
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	254	A orphanchild
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	255	? base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	256
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	257	diff shows what is not in patch:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	258
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	259	$ hg diff
12376 97ffc68f71d3 tests: add glob matching for unified tests Brodie Rao <brodie@bitheap.org> parents: 12375 diff changeset	260	diff -r ???????????? orphanchild (glob)
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	261	--- /dev/null
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	262	+++ b/orphanchild
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	263	@@ -0,0 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	264	+orphan
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	265
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	266	Before starting exclusive tests:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	267
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	268	$ cat .hg/patches/mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	269	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	270	# Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	271	mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	272
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	273	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	274	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	275	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	276	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	277	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	278	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	279	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	280	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	281	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	282	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	283	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	284	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	285
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	286	Exclude 2/base:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	287
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	288	$ hg qref -s -X 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	289
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	290	$ cat .hg/patches/mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	291	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	292	# Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	293	mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	294
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	295	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	296	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	297	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	298	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	299	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	300	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	301
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	302	status shows 2/base as dirty:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	303
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	304	$ hg status
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	305	M 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	306	A orphanchild
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	307	? base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	308
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	309	Remove 1/base and add 2/base again but not orphanchild:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	310
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	311	$ hg qref -s -X orphanchild -X 1/base 2/base orphanchild
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	312
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	313	$ cat .hg/patches/mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	314	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	315	# Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	316	mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	317
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	318	diff -r e7af5904b465 2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	319	--- a/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	320	+++ b/2/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	321	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	322	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	323	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	324
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	325	Add 1/base with include filter - and thus remove 2/base from patch:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	326
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	327	$ hg qref -s -I 1/ o* /
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	328
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	329	$ cat .hg/patches/mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	330	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	331	# Parent e7af5904b465cd1f4f3cf6b26fe14e8db6f63eaa
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	332	mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	333
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	334	diff -r e7af5904b465 1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	335	--- a/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	336	+++ b/1/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	337	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	338	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	339	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	340
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	341	$ cd ..
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	342
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	343
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	344	Test qrefresh --git losing copy metadata:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	345
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	346	$ hg init repo
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	347	$ cd repo
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	348
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	349	$ echo "[diff]" >> .hg/hgrc
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	350	$ echo "git=True" >> .hg/hgrc
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	351	$ echo a > a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	352
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	353	$ hg ci -Am adda
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	354	adding a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	355	$ hg copy a ab
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	356	$ echo b >> ab
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	357	$ hg copy a ac
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	358	$ echo c >> ac
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	359
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	360	Capture changes:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	361
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	362	$ hg qnew -f p1
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	363
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	364	$ hg qdiff
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	365	diff --git a/a b/ab
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	366	copy from a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	367	copy to ab
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	368	--- a/a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	369	+++ b/ab
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	370	@@ -1,1 +1,2 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	371	a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	372	+b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	373	diff --git a/a b/ac
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	374	copy from a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	375	copy to ac
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	376	--- a/a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	377	+++ b/ac
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	378	@@ -1,1 +1,2 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	379	a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	380	+c
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	381
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	382	Refresh and check changes again:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	383
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	384	$ hg qrefresh
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	385
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	386	$ hg qdiff
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	387	diff --git a/a b/ab
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	388	copy from a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	389	copy to ab
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	390	--- a/a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	391	+++ b/ab
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	392	@@ -1,1 +1,2 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	393	a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	394	+b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	395	diff --git a/a b/ac
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	396	copy from a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	397	copy to ac
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	398	--- a/a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	399	+++ b/ac
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	400	@@ -1,1 +1,2 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	401	a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	402	+c
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	403
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	404	$ cd ..
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	405
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	406
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	407	Issue1441: qrefresh confused after hg rename:
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	408
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	409	$ hg init repo-1441
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	410	$ cd repo-1441
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	411	$ echo a > a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	412	$ hg add a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	413	$ hg qnew -f p
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	414	$ hg mv a b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	415	$ hg qrefresh
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	416
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	417	$ hg qdiff
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	418	diff -r 000000000000 b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	419	--- /dev/null
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	420	+++ b/b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	421	@@ -0,0 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	422	+a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	423
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	424	$ cd ..
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	425
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	426
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	427	Issue2025: qrefresh does not honor filtering options when tip !=
4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12376 diff changeset	428	qtip:
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	429
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	430	$ hg init repo-2025
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	431	$ cd repo-2025
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	432	$ echo a > a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	433	$ echo b > b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	434	$ hg ci -qAm addab
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	435	$ echo a >> a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	436	$ echo b >> b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	437	$ hg qnew -f patch
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	438	$ hg up -qC 0
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	439	$ echo c > c
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	440	$ hg ci -qAm addc
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	441	$ hg up -qC 1
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	442
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	443	refresh with tip != qtip:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	444
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	445	$ hg --config diff.nodates=1 qrefresh -I b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	446
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	447	$ hg st
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	448	M a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	449
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	450	$ cat b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	451	b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	452	b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	453
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	454	$ cat .hg/patches/patch
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	455	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	456	# Parent 1a60229be7ac3e4a7f647508e99b87bef1f03593
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	457
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	458	diff -r 1a60229be7ac b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	459	--- a/b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	460	+++ b/b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	461	@@ -1,1 +1,2 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	462	b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	463	+b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	464
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	465	$ cd ..
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	466
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	467
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	468	Issue1441 with git patches:
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	469
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	470	$ hg init repo-1441-git
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	471	$ cd repo-1441-git
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	472
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	473	$ echo "[diff]" >> .hg/hgrc
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	474	$ echo "git=True" >> .hg/hgrc
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	475
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	476	$ echo a > a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	477	$ hg add a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	478	$ hg qnew -f p
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	479	$ hg mv a b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	480	$ hg qrefresh
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	481
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	482	$ hg qdiff --nodates
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	483	diff --git a/b b/b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	484	new file mode 100644
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	485	--- /dev/null
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	486	+++ b/b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	487	@@ -0,0 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	488	+a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	489
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	490	$ cd ..
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 10397 diff changeset	491
13632 33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	492	Refresh with bad usernames. Mercurial used to abort on bad usernames,
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	493	but only after writing the bad name into the patch.
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	494
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	495	$ hg init bad-usernames
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	496	$ cd bad-usernames
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	497	$ touch a
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	498	$ hg add a
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	499	$ hg qnew a
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	500	$ hg qrefresh -u 'foo
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	501	> bar'
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	502	transaction abort!
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	503	rollback completed
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	504	refresh interrupted while patch was popped! (revert --all, qpush to recover)
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	505	abort: username 'foo\nbar' contains a newline!
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	506	[255]
14452 ee574cfd0c32 patch: use temporary files to handle intermediate copies Patrick Mezard <pmezard@gmail.com> parents: 13632 diff changeset	507	$ rm a
13632 33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	508	$ cat .hg/patches/a
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	509	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	510	# Parent 0000000000000000000000000000000000000000
22519 c87f2a5a6e49 mq: correctly make an empty line after description in new patches Mads Kiilerich <madski@unity3d.com> parents: 17978 diff changeset	511
13632 33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	512	diff --git a/a b/a
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	513	new file mode 100644
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	514	$ hg qpush
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	515	applying a
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	516	now at: a
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	517	$ hg qrefresh -u ' '
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	518	transaction abort!
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	519	rollback completed
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	520	refresh interrupted while patch was popped! (revert --all, qpush to recover)
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	521	abort: empty username!
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	522	[255]
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	523	$ cat .hg/patches/a
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	524	# HG changeset patch
22521 3f948469bac0 mq: write '# Parent ' lines with two spaces like export does (BC) Mads Kiilerich <madski@unity3d.com> parents: 22519 diff changeset	525	# Parent 0000000000000000000000000000000000000000
22519 c87f2a5a6e49 mq: correctly make an empty line after description in new patches Mads Kiilerich <madski@unity3d.com> parents: 17978 diff changeset	526
13632 33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	527	diff --git a/a b/a
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	528	new file mode 100644
33a33f19aad2 mq: do not let qrefresh write bad patch Martin Geisler <mg@lazybytes.net> parents: 13173 diff changeset	529	$ cd ..
16026 31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	530
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	531	Refresh with phase data:
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	532
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	533
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	534
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	535	$ cd repo
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	536	$ echo 'babar' >> a
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	537	$ hg qnew -m 'update a' p2.diff
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	538	$ hg phase p2.diff
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	539	2: draft
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	540	$ echo 'beber' >> a
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	541	$ hg qref
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	542	$ hg phase p2.diff
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	543	2: draft
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	544	$ hg phase --force --secret p2.diff
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	545	$ echo 'bibir' >> a
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	546	$ hg qref
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	547	$ hg phase p2.diff
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	548	2: secret
31c02546e6de qrefresh: keep changeset phase during refresh Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 14452 diff changeset	549
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16026 diff changeset	550	$ cd ..

author	Martin von Zweigbergk <martinvonz@gmail.com>
	Wed, 08 Oct 2014 14:16:53 -0700
changeset 22841	18b3869179f9
parent 22521	3f948469bac0
child 23172	e955549cd045
permissions	-rw-r--r--