mercurial: tests/test-mq-qdiff.t@b701610f6c56 (annotated)

12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	1	$ echo "[extensions]" >> $HGRCPATH
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	2	$ echo "mq=" >> $HGRCPATH
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	3	$ echo "[mq]" >> $HGRCPATH
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	4	$ echo "git=keep" >> $HGRCPATH
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	5
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	6	$ hg init a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	7	$ cd a
2916 8ca608c1eb02 tests: new test for mq qdiff command Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	8
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	9	$ echo 'base' > base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	10	$ hg ci -Ambase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	11	adding base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	12
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	13	$ hg qnew -mmqbase mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	14
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	15	$ echo 'patched' > base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	16	$ hg qrefresh
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	17
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	18	qdiff:
2916 8ca608c1eb02 tests: new test for mq qdiff command Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	19
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	20	$ hg qdiff \| sed -e "s/$+++ [a-zA-Z0-9_/.-]$./\1/"
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	21	diff -r d20a80d4def3 base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	22	--- a/base Thu Jan 01 00:00:00 1970 +0000
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	23	+++ b/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	24	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	25	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	26	+patched
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	27
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	28	qdiff dirname:
2916 8ca608c1eb02 tests: new test for mq qdiff command Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	29
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	30	$ hg qdiff --nodates .
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	31	diff -r d20a80d4def3 base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	32	--- a/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	33	+++ b/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	34	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	35	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	36	+patched
2916 8ca608c1eb02 tests: new test for mq qdiff command Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	37
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	38	qdiff filename:
2916 8ca608c1eb02 tests: new test for mq qdiff command Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	39
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	40	$ hg qdiff --nodates base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	41	diff -r d20a80d4def3 base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	42	--- a/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	43	+++ b/base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	44	@@ -1,1 +1,1 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	45	-base
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	46	+patched
2916 8ca608c1eb02 tests: new test for mq qdiff command Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	47
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	48	$ hg revert -a
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	49
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	50	$ hg qpop
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	51	popping mqbase
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	52	patch queue now empty
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	53
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	54	$ hg qdelete mqbase
2916 8ca608c1eb02 tests: new test for mq qdiff command Giorgos Keramidas <keramida@ceid.upatras.gr> parents: diff changeset	55
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	56	$ printf '1\n2\n3\n4\nhello world\ngoodbye world\n7\n8\n9\n' > lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	57	$ hg ci -Amlines -d '2 0'
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	58	adding lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	59
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	60	$ hg qnew -mmqbase2 mqbase2
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	61	$ printf '\n\n1\n2\n3\n4\nhello world\n goodbye world\n7\n8\n9\n' > lines
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 2990 diff changeset	62
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	63	$ hg qdiff --nodates -U 1
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	64	diff -r b0c220e1cf43 lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	65	--- a/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	66	+++ b/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	67	@@ -1,1 +1,3 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	68	+
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	69	+
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	70	1
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	71	@@ -4,4 +6,4 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	72	4
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	73	-hello world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	74	-goodbye world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	75	+hello world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	76	+ goodbye world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	77	7
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 2990 diff changeset	78
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	79	$ hg qdiff --nodates -b
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	80	diff -r b0c220e1cf43 lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	81	--- a/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	82	+++ b/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	83	@@ -1,9 +1,11 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	84	+
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	85	+
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	86	1
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	87	2
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	88	3
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	89	4
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	90	hello world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	91	-goodbye world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	92	+ goodbye world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	93	7
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	94	8
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	95	9
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 2990 diff changeset	96
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	97	$ hg qdiff --nodates -U 1 -B
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	98	diff -r b0c220e1cf43 lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	99	--- a/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	100	+++ b/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	101	@@ -4,4 +6,4 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	102	4
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	103	-hello world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	104	-goodbye world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	105	+hello world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	106	+ goodbye world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	107	7
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 2990 diff changeset	108
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	109	$ hg qdiff --nodates -w
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	110	diff -r b0c220e1cf43 lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	111	--- a/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	112	+++ b/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	113	@@ -1,3 +1,5 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	114	+
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	115	+
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	116	1
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	117	2
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	118	3
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 2990 diff changeset	119
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	120	$ hg qdiff --nodates --reverse
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	121	diff -r b0c220e1cf43 lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	122	--- a/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	123	+++ b/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	124	@@ -1,11 +1,9 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	125	-
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	126	-
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	127	1
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	128	2
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	129	3
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	130	4
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	131	-hello world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	132	- goodbye world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	133	+hello world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	134	+goodbye world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	135	7
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	136	8
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	137	9
6668 034f444902d9 mq: qdiff: support all diffopts Jason Orendorff <jorendorff@mozilla.com> parents: 2990 diff changeset	138
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	139	qdiff preserve existing git flag:
9725 3f522d2fa633 diff: add --inverse option Yannick Gingras <ygingras@ygingras.net> parents: 6668 diff changeset	140
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	141	$ hg qrefresh --git
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	142	$ echo a >> lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	143	$ hg qdiff
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	144	diff --git a/lines b/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	145	--- a/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	146	+++ b/lines
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	147	@@ -1,9 +1,12 @@
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	148	+
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	149	+
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	150	1
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	151	2
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	152	3
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	153	4
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	154	-hello world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	155	-goodbye world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	156	+hello world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	157	+ goodbye world
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	158	7
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	159	8
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	160	9
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	161	+a
10191 99d285ac5da4 mq: qdiff with the same diff options than qrefresh (issue1350) Patrick Mezard <pmezard@gmail.com> parents: 9857 diff changeset	162
12324 b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	163	$ hg qdiff --stat
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	164	lines \| 7 +++++--
b701610f6c56 tests: unify some of test-mq* Adrian Buehlmann <adrian@cadifra.com> parents: 11049 diff changeset	165	1 files changed, 5 insertions(+), 2 deletions(-)
10191 99d285ac5da4 mq: qdiff with the same diff options than qrefresh (issue1350) Patrick Mezard <pmezard@gmail.com> parents: 9857 diff changeset	166

author	Adrian Buehlmann <adrian@cadifra.com>
	Sun, 19 Sep 2010 23:42:18 +0200
changeset 12324	b701610f6c56
parent 11049	tests/test-mq-qdiff@a84f14228b1d
child 12366	c01dc9087d9a
permissions	-rw-r--r--