Mercurial: tests/test-mq-qrefresh.t@84e8a6834223 (annotated)

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

author	Simon Farnsworth <simonfar@fb.com>
	Mon, 06 Mar 2017 03:19:40 -0800
changeset 31204	84e8a6834223
parent 26780	bbf544b5f2e9
child 45906	95c4cca641f6
permissions	-rw-r--r--