mercurial: tests/test-log.t@f2daa6ab514a (annotated)

11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1	$ hg init a
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	2
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	3	$ cd a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	4	$ echo a > a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	5	$ hg ci -Ama -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	6	adding a
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	7
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	8	$ hg cp a b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	9	$ hg ci -mb -d '2 0'
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	10
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	11	$ mkdir dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	12	$ hg mv b dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	13	$ hg ci -mc -d '3 0'
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	14
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	15	$ hg mv a b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	16	$ echo a > d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	17	$ hg add d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	18	$ hg ci -md -d '4 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	19
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	20	$ hg mv dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	21	$ hg ci -me -d '5 0'
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	22
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	23	$ hg log a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	24	changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	25	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	26	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	27	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	28
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	29
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	30	-f, directory
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	31
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	32	$ hg log -f dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	33	abort: cannot follow nonexistent file: "dir"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	34
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	35	-f, but no args
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	36
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	37	$ hg log -f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	38	changeset: 4:66c1345dc4f9
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	39	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	40	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	41	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	42	summary: e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	43
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	44	changeset: 3:7c6c671bb7cc
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	45	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	46	date: Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	47	summary: d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	48
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	49	changeset: 2:41dd4284081e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	50	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	51	date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	52	summary: c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	53
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	54	changeset: 1:784de7cef101
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	55	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	56	date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	57	summary: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	58
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	59	changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	60	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	61	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	62	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	63
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	64
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	65	one rename
11562 efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647) Joel Rosdahl <joel@rosdahl.net> parents: 11509 diff changeset	66
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	67	$ hg log -vf a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	68	changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	69	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	70	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	71	files: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	72	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	73	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	74
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	75
3197 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2901 diff changeset	76
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	77	many renames
10776 08870cf7d388 Fix default style so 'log --copies' has a start and an end. Greg Ward <greg-hg@gerg.ca> parents: 10061 diff changeset	78
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	79	$ hg log -vf e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	80	changeset: 4:66c1345dc4f9
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	81	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	82	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	83	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	84	files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	85	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	86	e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	87
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	88
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	89	changeset: 2:41dd4284081e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	90	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	91	date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	92	files: b dir/b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	93	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	94	c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	95
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	96
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	97	changeset: 1:784de7cef101
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	98	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	99	date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	100	files: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	101	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	102	b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	103
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	104
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	105	changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	106	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	107	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	108	files: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	109	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	110	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	111
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	112
5811 180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 4510 diff changeset	113
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	114
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	115	log -pf dir/b
4510 e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	116
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	117	$ hg log -pf dir/b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	118	changeset: 2:41dd4284081e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	119	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	120	date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	121	summary: c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	122
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	123	diff -r 784de7cef101 -r 41dd4284081e dir/b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	124	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	125	+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	126	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	127	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	128
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	129	changeset: 1:784de7cef101
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	130	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	131	date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	132	summary: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	133
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	134	diff -r 8580ff50825a -r 784de7cef101 b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	135	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	136	+++ b/b Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	137	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	138	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	139
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	140	changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	141	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	142	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	143	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	144
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	145	diff -r 000000000000 -r 8580ff50825a a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	146	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	147	+++ b/a Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	148	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	149	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	150
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	151
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	152	log -vf dir/b
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	153
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	154	$ hg log -vf dir/b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	155	changeset: 2:41dd4284081e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	156	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	157	date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	158	files: b dir/b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	159	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	160	c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	161
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	162
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	163	changeset: 1:784de7cef101
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	164	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	165	date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	166	files: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	167	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	168	b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	169
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	170
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	171	changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	172	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	173	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	174	files: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	175	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	176	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	177
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	178
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	179
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	180
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	181	log copies with --copies
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	182
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	183	$ hg log -vC --template '{rev} {file_copies}\n'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	184	4 e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	185	3 b (a)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	186	2 dir/b (b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	187	1 b (a)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	188	0
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	189
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	190	log copies switch without --copies, with old filecopy template
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	191
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	192	$ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	193	4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	194	3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	195	2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	196	1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	197	0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	198
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	199	log copies switch with --copies
4510 e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	200
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	201	$ hg log -vC --template '{rev} {file_copies_switch}\n'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	202	4 e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	203	3 b (a)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	204	2 dir/b (b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	205	1 b (a)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	206	0
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	207
4510 e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	208
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	209	log copies with hardcoded style and with --style=default
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	210
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	211	$ hg log -vC -r4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	212	changeset: 4:66c1345dc4f9
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	213	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	214	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	215	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	216	files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	217	copies: e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	218	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	219	e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	220
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	221
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	222	$ hg log -vC -r4 --style=default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	223	changeset: 4:66c1345dc4f9
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	224	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	225	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	226	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	227	files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	228	copies: e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	229	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	230	e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	231
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	232
3718 7db88b094b14 fix hg log -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3383 diff changeset	233
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	234
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	235	log copies, non-linear manifest
7762 fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip) Jim Correia <jim.correia@pobox.com> parents: 7062 diff changeset	236
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	237	$ hg up -C 3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	238	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	239	$ hg mv dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	240	$ echo foo > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	241	$ hg ci -Ame2 -d '6 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	242	adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	243	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	244	$ hg log -v --template '{rev} {file_copies}\n' -r 5
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	245	5 e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	246
3718 7db88b094b14 fix hg log -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3383 diff changeset	247
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	248	log copies, execute bit set
9373 b34184c046ac log: fix traceback for log -k caused by 1ef630452e0b (issue1805) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 8020 diff changeset	249
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	250	$ chmod +x e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	251	$ hg ci -me3 -d '7 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	252	$ hg log -v --template '{rev} {file_copies}\n' -r 6
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	253	6
9421 c8e4dc218aaf log: prevent negative date range from displaying entire log (issue1805) Christian Ebert <blacktrash@gmx.net> parents: 9373 diff changeset	254
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	255
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	256	log -p d
10826 717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10776 diff changeset	257
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	258	$ hg log -pv d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	259	changeset: 3:7c6c671bb7cc
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	260	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	261	date: Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	262	files: a b d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	263	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	264	d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	265
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	266
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	267	diff -r 41dd4284081e -r 7c6c671bb7cc d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	268	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	269	+++ b/d Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	270	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	271	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	272
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 10960 diff changeset	273
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	274
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	275	log --removed file
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	276
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	277	$ hg log --removed -v a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	278	changeset: 3:7c6c671bb7cc
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	279	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	280	date: Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	281	files: a b d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	282	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	283	d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	284
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	285
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	286	changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	287	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	288	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	289	files: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	290	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	291	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	292
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	293
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	294
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	295	log --removed revrange file
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	296
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	297	$ hg log --removed -v -r0:2 a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	298	changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	299	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	300	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	301	files: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	302	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	303	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	304
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	305
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	306
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	307
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	308	log --follow tests
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	309
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	310	$ hg init ../follow
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	311	$ cd ../follow
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	312
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	313	$ echo base > base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	314	$ hg ci -Ambase -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	315	adding base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	316
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	317	$ echo r1 >> base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	318	$ hg ci -Amr1 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	319	$ echo r2 >> base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	320	$ hg ci -Amr2 -d '1 0'
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	321
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	322	$ hg up -C 1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	323	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	324	$ echo b1 > b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	325	$ hg ci -Amb1 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	326	adding b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	327	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	328
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	329
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	330	log -f
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	331
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	332	$ hg log -f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	333	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	334	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	335	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	336	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	337	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	338	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	339
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	340	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	341	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	342	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	343	summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	344
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	345	changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	346	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	347	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	348	summary: base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	349
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	350
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	351
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	352	log -f -r 1:tip
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	353
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	354	$ hg up -C 0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	355	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	356	$ echo b2 > b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	357	$ hg ci -Amb2 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	358	adding b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	359	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	360	$ hg log -f -r 1:tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	361	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	362	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	363	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	364	summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	365
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	366	changeset: 2:60c670bf5b30
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	367	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	368	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	369	summary: r2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	370
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	371	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	372	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	373	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	374	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	375	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	376
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	377
10960 ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	378
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	379	log -r . with two parents
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	380
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	381	$ hg up -C 3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	382	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	383	$ hg merge tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	384	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	385	(branch merge, don't forget to commit)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	386	$ hg log -r .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	387	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	388	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	389	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	390	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	391	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	392
10960 ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	393
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	394
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	395	log -r . with one parent
10960 ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	396
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	397	$ hg ci -mm12 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	398	$ hg log -r .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	399	changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	400	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	401	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	402	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	403	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	404	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	405	summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	406
11508 fbab0875fd09 log: fix missing diff output for hg log -p in sub directory Yuya Nishihara <yuya@tcha.org> parents: 11141 diff changeset	407
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	408	$ echo postm >> b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	409	$ hg ci -Amb1.1 -d'1 0'
11509 2eaaad99f2f0 test-log: also test "log -p -R" case Martin Geisler <mg@lazybytes.net> parents: 11508 diff changeset	410
2eaaad99f2f0 test-log: also test "log -p -R" case Martin Geisler <mg@lazybytes.net> parents: 11508 diff changeset	411
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	412	log --follow-first
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	413
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	414	$ hg log --follow-first
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	415	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	416	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	417	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	418	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	419	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	420
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	421	changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	422	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	423	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	424	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	425	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	426	summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	427
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	428	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	429	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	430	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	431	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	432	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	433
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	434	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	435	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	436	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	437	summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	438
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	439	changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	440	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	441	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	442	summary: base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	443
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	444
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	445
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	446	log -P 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	447
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	448	$ hg log -P 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	449	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	450	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	451	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	452	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	453	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	454
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	455	changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	456	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	457	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	458	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	459	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	460	summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	461
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	462	changeset: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	463	parent: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	464	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	465	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	466	summary: b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	467
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	468	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	469	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	470	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	471	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	472	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	473
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	474
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	475
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	476	log -r tip -p --git
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	477
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	478	$ hg log -r tip -p --git
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	479	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	480	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	481	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	482	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	483	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	484
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	485	diff --git a/b1 b/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	486	--- a/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	487	+++ b/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	488	@@ -1,1 +1,2 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	489	b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	490	+postm
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	491
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	492
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	493
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	494	log -r ""
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	495
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	496	$ hg log -r ''
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	497	hg: parse error: empty query
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	498
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	499	log -r <some unknown node id>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	500
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	501	$ hg log -r 1000000000000000000000000000000000000000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	502	abort: unknown revision '1000000000000000000000000000000000000000'!
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	503
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	504	log -k r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	505
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	506	$ hg log -k r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	507	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	508	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	509	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	510	summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	511
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	512
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	513
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	514	log -d -1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	515
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	516	$ hg log -d -1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	517
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	518
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	519	log -p -l2 --color=always
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	520
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	521	$ hg --config extensions.color= --config color.mode=ansi \
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	522	> log -p -l2 --color=always
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	523	[0;33mchangeset: 6:2404bbcab562[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	524	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	525	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	526	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	527	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	528
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	529	[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	530	[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	531	[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	532	[0;35m@@ -1,1 +1,2 @@[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	533	b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	534	[0;32m+postm[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	535
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	536	[0;33mchangeset: 5:302e9dd6890d[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	537	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	538	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	539	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	540	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	541	summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	542
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	543	[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	544	[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	545	[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	546	[0;35m@@ -0,0 +1,1 @@[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	547	[0;32m+b2[0m
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	548
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	549
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	550
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	551	log -r tip --stat
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	552
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	553	$ hg log -r tip --stat
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	554	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	555	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	556	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	557	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	558	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	559
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	560	b1 \| 1 +
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	561	1 files changed, 1 insertions(+), 0 deletions(-)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	563
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	564	$ cd ..
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	565
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	566	$ hg init usertest
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	567	$ cd usertest
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	568
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	569	$ echo a > a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	570	$ hg ci -A -m "a" -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	571	adding a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	572	$ echo b > b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	573	$ hg ci -A -m "b" -u "User Two <user2@example.org>"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	574	adding b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	575
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	576	$ hg log -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	577	changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	578	user: User One <user1@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	579	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	580	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	581
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	582	$ hg log -u "user1" -u "user2"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	583	changeset: 1:e834b5e69c0e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	584	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	585	user: User Two <user2@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	586	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	587	summary: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	588
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	589	changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	590	user: User One <user1@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	591	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	592	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	593
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	594	$ hg log -u "user3"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	595
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	596	$ cd ..
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	597
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	598	$ hg init branches
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	599	$ cd branches
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	600
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	601	$ echo a > a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	602	$ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	603	adding a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	604	$ hg branch test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	605	marked working directory as branch test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	606	$ echo b > b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	607	$ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	608	adding b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	609
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	610	$ hg up default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	611	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	612	$ echo c > c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	613	$ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	614	adding c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	615	$ hg up test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	616	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	617	$ echo c > c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	618	$ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	619	adding c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	620
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	621
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	622	log -b default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	623
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	624	$ hg log -b default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	625	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	626	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	627	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	628	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	629	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	630
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	631	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	632	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	633	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	634	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	635
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	636
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	637
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	638	log -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	639
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	640	$ hg log -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	641	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	642	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	643	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	644	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	645	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	646	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	647	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	648
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	649	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	650	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	651	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	652	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	653	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	654
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	655
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	656
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	657	log -b dummy
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	658
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	659	$ hg log -b dummy
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	660	abort: unknown revision 'dummy'!
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	661
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	662
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	663	log -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	664
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	665	$ hg log -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	666	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	667	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	668	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	669	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	670	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	671	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	672	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	673
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	674	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	675	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	676	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	677	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	678	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	679
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	680
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	681
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	682	log -b default -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	683
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	684	$ hg log -b default -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	685	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	686	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	687	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	688	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	689	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	690	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	691	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	692
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	693	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	694	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	695	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	696	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	697	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	698
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	699	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	700	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	701	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	702	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	703	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	704
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	705	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	706	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	707	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	708	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	709
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	710
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	711
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	712	log -b default -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	713
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	714	$ hg log -b default -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	715	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	716	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	717	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	718	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	719	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	720	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	721	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	722
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	723	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	724	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	725	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	726	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	727	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	728
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	729	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	730	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	731	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	732	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	733	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	734
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	735	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	736	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	737	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	738	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	739
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	740
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	741
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	742	log -b . -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	743
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	744	$ hg log -b . -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	745	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	746	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	747	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	748	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	749	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	750	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	751	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	752
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	753	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	754	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	755	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	756	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	757	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	758
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	759
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	760
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	761	log -b 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	762
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	763	$ hg log -b 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	764	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	765	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	766	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	767	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	768	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	769
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	770	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	771	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	772	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	773	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	774
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	775
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	776
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	777	log -p --cwd dir (in subdir)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	778
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	779	$ mkdir dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	780	$ hg log -p --cwd dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	781	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	782	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	783	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	784	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	785	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	786	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	787	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	788
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	789	diff -r d32277701ccb -r f5d8de11c2e2 c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	790	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	791	+++ b/c Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	792	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	793	+c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	794
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	795	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	796	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	797	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	798	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	799	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	800
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	801	diff -r 24427303d56f -r c3a4f03cc9a7 c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	802	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	803	+++ b/c Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	804	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	805	+c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	806
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	807	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	808	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	809	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	810	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	811	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	812
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	813	diff -r 24427303d56f -r d32277701ccb b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	814	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	815	+++ b/b Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	816	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	817	+b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	818
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	819	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	820	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	821	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	822	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	823
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	824	diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	825	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	826	+++ b/a Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	827	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	828	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	829
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	830
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	831
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	832	log -p -R repo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	833
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	834	$ cd dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	835	$ hg log -p -R .. ../a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	836	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	837	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	838	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	839	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	840
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	841	diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	842	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	843	+++ b/a Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	844	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	845	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	846
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	847
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	848
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	849	$ cd ..
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	850	$ hg init follow2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	851	$ cd follow2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	852
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	853
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	854	# Build the following history:
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	855	# tip - o - x - o - x - x
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	856	# \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	857	# o - o - o - x
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	858	# \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	859	# o
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	860	#
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	861
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	862	# Where "o" is a revision containing "foo" and
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	863	# "x" is a revision without "foo"
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	864
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	865	$ touch init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	866	$ hg ci -A -m "init, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	867	adding init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	868	$ echo 'foo' > init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	869	$ hg ci -m "change, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	870	$ echo 'foo' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	871	$ hg ci -A -m "add unrelated old foo"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	872	adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	873	$ hg rm foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	874	$ hg ci -m "delete foo, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	875	$ echo 'related' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	876	$ hg ci -A -m "add foo, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	877	adding foo
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	878
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	879	$ hg up 0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	880	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	881	$ touch branch
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	882	$ hg ci -A -m "first branch, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	883	adding branch
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	884	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	885	$ touch foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	886	$ hg ci -A -m "create foo, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	887	adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	888	$ echo 'change' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	889	$ hg ci -m "change foo, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	890
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	891	$ hg up 6
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	892	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	893	$ echo 'change foo in branch' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	894	$ hg ci -m "change foo in branch, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	895	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	896	$ hg merge 7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	897	merging foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	898	warning: conflicts during merge.
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	899	merging foo failed!
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	900	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
12314 f2daa6ab514a merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Brodie Rao <brodie@bitheap.org> parents: 11900 diff changeset	901	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	902	$ echo 'merge 1' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	903	$ hg resolve -m foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	904	$ hg ci -m "First merge, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	905
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	906	$ hg merge 4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	907	merging foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	908	warning: conflicts during merge.
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	909	merging foo failed!
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	910	1 files updated, 0 files merged, 0 files removed, 1 files unresolved
12314 f2daa6ab514a merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C' Brodie Rao <brodie@bitheap.org> parents: 11900 diff changeset	911	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	912	$ echo 'merge 2' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	913	$ hg resolve -m foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	914	$ hg ci -m "Last merge, related"
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	915
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	916	$ hg --config "extensions.graphlog=" glog
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	917	@ changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	918	\|\ tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	919	\| \| parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	920	\| \| parent: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	921	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	922	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	923	\| \| summary: Last merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	924	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	925	\| o changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	926	\| \|\ parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	927	\| \| \| parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	928	\| \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	929	\| \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	930	\| \| \| summary: First merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	931	\| \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	932	\| \| o changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	933	\| \| \| parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	934	\| \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	935	\| \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	936	\| \| \| summary: change foo in branch, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	937	\| \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	938	\| o \| changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	939	\| \|/ user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	940	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	941	\| \| summary: change foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	942	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	943	\| o changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	944	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	945	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	946	\| \| summary: create foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	947	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	948	\| o changeset: 5:73db34516eb9
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	949	\| \| parent: 0:e87515fd044a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	950	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	951	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	952	\| \| summary: first branch, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	953	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	954	o \| changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	955	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	956	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	957	\| \| summary: add foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	958	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	959	o \| changeset: 3:dd78ae4afb56
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	960	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	961	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	962	\| \| summary: delete foo, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	963	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	964	o \| changeset: 2:c4c64aedf0f7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	965	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	966	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	967	\| \| summary: add unrelated old foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	968	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	969	o \| changeset: 1:e5faa7440653
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	970	\|/ user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	971	\| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	972	\| summary: change, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	973	\|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	974	o changeset: 0:e87515fd044a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	975	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	976	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	977	summary: init, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	978
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	979
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	980	$ hg --traceback log -f foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	981	changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	982	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	983	parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	984	parent: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	985	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	986	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	987	summary: Last merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	988
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	989	changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	990	parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	991	parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	992	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	993	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	994	summary: First merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	995
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	996	changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	997	parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	998	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	999	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1000	summary: change foo in branch, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1001
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1002	changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1003	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1004	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1005	summary: change foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1006
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1007	changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1008	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1009	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1010	summary: create foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1011
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1012	changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1013	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1014	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1015	summary: add foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1016
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1017
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1018	$ exit 0

author	Brodie Rao <brodie@bitheap.org>
	Sun, 12 Sep 2010 18:05:53 -0500
changeset 12314	f2daa6ab514a
parent 11900	cd7182358d9f
child 12316	4134686b83e1
permissions	-rw-r--r--