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

18991 c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	1	Log on empty repository: checking consistency
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	2
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	3	$ hg init empty
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	4	$ cd empty
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	5	$ hg log
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	6	$ hg log -r 1
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	7	abort: unknown revision '1'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	8	[255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	9	$ hg log -r -1:0
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	10	abort: unknown revision '-1'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	11	[255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	12	$ hg log -r 'branch(name)'
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	13	abort: unknown revision 'name'!
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	14	[255]
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	15	$ hg log -r null -q
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	16	-1:000000000000
c1af1fb314bc log: fix behavior with empty repositories (issue3497) Alexander Plavin <me@aplavin.ru> parents: 18495 diff changeset	17
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	18	The g is crafted to have 2 filelog topological heads in a linear
18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	19	changeset graph
18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	20
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	21	$ hg init a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	22	$ cd a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	23	$ echo a > a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	24	$ echo f > f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	25	$ hg ci -Ama -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	26	adding a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	27	adding f
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	28
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	29	$ hg cp a b
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	30	$ hg cp f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	31	$ 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	32
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	33	$ mkdir dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	34	$ hg mv b dir
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	35	$ echo g >> g
18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	36	$ echo f >> f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	37	$ 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	38
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	39	$ hg mv a b
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	40	$ hg cp -f f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	41	$ echo a > d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	42	$ hg add d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	43	$ hg ci -md -d '4 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	44
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	45	$ hg mv dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	46	$ 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	47
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	48	$ hg log a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	49	changeset: 0:9161b9aeaf16
11900 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:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	52	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	53
18340 8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	54	log on directory
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	55
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	56	$ hg log dir
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	57	changeset: 4:7e4639b4691b
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	58	tag: tip
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	59	user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	60	date: Thu Jan 01 00:00:05 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	61	summary: e
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	62
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	63	changeset: 2:f8954cd4dc1f
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	64	user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	65	date: Thu Jan 01 00:00:03 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	66	summary: c
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	67
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	68	$ hg log somethingthatdoesntexist dir
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	69	changeset: 4:7e4639b4691b
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	70	tag: tip
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	71	user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	72	date: Thu Jan 01 00:00:05 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	73	summary: e
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	74
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	75	changeset: 2:f8954cd4dc1f
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	76	user: test
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	77	date: Thu Jan 01 00:00:03 1970 +0000
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	78	summary: c
8802277c40ee log: make log work even if first parameter doesn't exist Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	79
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	80
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	81	-f, directory
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	82
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	83	$ hg log -f dir
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	84	abort: cannot follow file not in parent revision: "dir"
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	85	[255]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	86
19125 6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	87	-f, a wrong style
6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	88
6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	89	$ hg log -f -l1 --style something
6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	90	abort: style 'something' not found
19127 d982edcfe7f0 templater: fix output instability from gsoc patches Augie Fackler <raf@durin42.com> parents: 19126 diff changeset	91	(available styles: bisect, changelog, compact, default, phases, xml)
19125 6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	92	[255]
6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	93
19126 5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	94	-f, phases style
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	95
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	96
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	97	$ hg log -f -l1 --style phases
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	98	changeset: 4:7e4639b4691b
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	99	tag: tip
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	100	phase: draft
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	101	user: test
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	102	date: Thu Jan 01 00:00:05 1970 +0000
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	103	summary: e
5c5152af0d15 log-style: add a log style that is default+phase (issue3436) Iulian Stana <julian.stana@gmail.com> parents: 19125 diff changeset	104
19125 6ba6e345961e templater: show the style list when I try to use a wrong one Iulian Stana <julian.stana@gmail.com> parents: 18991 diff changeset	105
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	106	-f, but no args
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	107
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	108	$ hg log -f
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	109	changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	110	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	111	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	112	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	113	summary: e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	114
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	115	changeset: 3:2ca5ba701980
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	116	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	117	date: Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	118	summary: d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	119
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	120	changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	121	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	122	date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	123	summary: c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	124
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	125	changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	126	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	127	date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	128	summary: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	129
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	130	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	131	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	132	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	133	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	134
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	135
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	136	one rename
11562 efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647) Joel Rosdahl <joel@rosdahl.net> parents: 11509 diff changeset	137
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	138	$ hg up -q 2
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	139	$ hg log -vf a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	140	changeset: 0:9161b9aeaf16
11900 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
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	143	files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	144	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	145	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	146
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	147
3197 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2901 diff changeset	148
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	149	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	150
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	151	$ hg up -q tip
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	152	$ hg log -vf e
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	153	changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	154	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	155	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	156	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	157	files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	158	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	159	e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	160
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	161
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	162	changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	163	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	164	date: Thu Jan 01 00:00:03 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	165	files: b dir/b f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	166	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	167	c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	168
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	169
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	170	changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	171	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	172	date: Thu Jan 01 00:00:02 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	173	files: b g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	174	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	175	b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	176
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	177
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	178	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	179	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	180	date: Thu Jan 01 00:00:01 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	181	files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	182	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	183	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	184
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	185
5811 180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 4510 diff changeset	186
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	187
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	188	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	189
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	190	$ hg up -q 3
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	191	$ hg log -pf dir/b
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	192	changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	193	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	194	date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	195	summary: c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	196
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	197	diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	198	--- /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	199	+++ 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	200	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	201	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	202
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	203	changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	204	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	205	date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	206	summary: b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	207
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	208	diff -r 9161b9aeaf16 -r d89b0a12d229 b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	209	--- /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	210	+++ 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	211	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	212	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	213
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	214	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	215	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	216	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	217	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	218
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	219	diff -r 000000000000 -r 9161b9aeaf16 a
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	220	--- /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	221	+++ 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	222	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	223	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	224
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	225
21876 584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	226	log -pf b inside dir
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	227
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	228	$ hg --cwd=dir log -pf b
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	229	changeset: 2:f8954cd4dc1f
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	230	user: test
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	231	date: Thu Jan 01 00:00:03 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	232	summary: c
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	233
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	234	diff -r d89b0a12d229 -r f8954cd4dc1f dir/b
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	235	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	236	+++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	237	@@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	238	+a
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	239
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	240	changeset: 1:d89b0a12d229
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	241	user: test
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	242	date: Thu Jan 01 00:00:02 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	243	summary: b
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	244
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	245	diff -r 9161b9aeaf16 -r d89b0a12d229 b
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	246	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	247	+++ b/b Thu Jan 01 00:00:02 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	248	@@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	249	+a
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	250
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	251	changeset: 0:9161b9aeaf16
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	252	user: test
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	253	date: Thu Jan 01 00:00:01 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	254	summary: a
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	255
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	256	diff -r 000000000000 -r 9161b9aeaf16 a
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	257	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	258	+++ b/a Thu Jan 01 00:00:01 1970 +0000
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	259	@@ -0,0 +1,1 @@
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	260	+a
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	261
584bbfd1b50d log: make --patch --follow work inside a subdirectory Siddharth Agarwal <sid0@fb.com> parents: 20699 diff changeset	262
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	263	log -vf dir/b
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	264
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	265	$ hg log -vf dir/b
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	266	changeset: 2:f8954cd4dc1f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	267	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	268	date: Thu Jan 01 00:00:03 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	269	files: b dir/b f g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	270	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	271	c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	272
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	273
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	274	changeset: 1:d89b0a12d229
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	275	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	276	date: Thu Jan 01 00:00:02 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	277	files: b g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	278	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	279	b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	280
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	281
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	282	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	283	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	284	date: Thu Jan 01 00:00:01 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	285	files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	286	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	287	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	288
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	289
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	290
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	291
16165 60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	292	-f and multiple filelog heads
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	293
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	294	$ hg up -q 2
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	295	$ hg log -f g --template '{rev}\n'
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	296	2
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	297	1
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	298	0
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	299	$ hg up -q tip
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	300	$ hg log -f g --template '{rev}\n'
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	301	3
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	302	2
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	303	0
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	304
60101427d618 log: fix --follow FILE ancestry calculation Patrick Mezard <patrick@mezard.eu> parents: 16164 diff changeset	305
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	306	log copies with --copies
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	307
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	308	$ hg log -vC --template '{rev} {file_copies}\n'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	309	4 e (dir/b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	310	3 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	311	2 dir/b (b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	312	1 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	313	0
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	314
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	315	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	316
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	317	$ 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	318	4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	319	3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	320	2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	321	1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	322	0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	323
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	324	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	325
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	326	$ hg log -vC --template '{rev} {file_copies_switch}\n'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	327	4 e (dir/b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	328	3 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	329	2 dir/b (b)
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	330	1 b (a)g (f)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	331	0
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	332
4510 e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	333
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	334	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	335
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	336	$ hg log -vC -r4
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	337	changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	338	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	339	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	340	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	341	files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	342	copies: e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	343	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	344	e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	345
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	346
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	347	$ hg log -vC -r4 --style=default
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	348	changeset: 4:7e4639b4691b
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	349	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	350	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	351	date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	352	files: dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	353	copies: e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	354	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	355	e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	356
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	357
3718 7db88b094b14 fix hg log -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3383 diff changeset	358
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	359
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	360	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	361
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	362	$ hg up -C 3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	363	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	364	$ hg mv dir/b e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	365	$ echo foo > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	366	$ hg ci -Ame2 -d '6 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	367	adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	368	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	369	$ 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	370	5 e (dir/b)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	371
3718 7db88b094b14 fix hg log -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3383 diff changeset	372
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	373	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	374
16887 91e417e9f4b0 test-log: enable for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16165 diff changeset	375	#if execbit
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	376	$ chmod +x e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	377	$ hg ci -me3 -d '7 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	378	$ 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	379	6
16887 91e417e9f4b0 test-log: enable for Windows Adrian Buehlmann <adrian@cadifra.com> parents: 16165 diff changeset	380	#endif
9421 c8e4dc218aaf log: prevent negative date range from displaying entire log (issue1805) Christian Ebert <blacktrash@gmx.net> parents: 9373 diff changeset	381
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	382
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	383	log -p d
10826 717c35d55fb3 color: colorize based on output labels instead of parsing output Brodie Rao <brodie@bitheap.org> parents: 10776 diff changeset	384
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	385	$ hg log -pv d
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	386	changeset: 3:2ca5ba701980
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	387	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	388	date: Thu Jan 01 00:00:04 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	389	files: a b d g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	390	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	391	d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	392
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	393
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	394	diff -r f8954cd4dc1f -r 2ca5ba701980 d
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	395	--- /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	396	+++ 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	397	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	398	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	399
11061 51d0387523c6 log: add --stat for diffstat output Yuya Nishihara <yuya@tcha.org> parents: 10960 diff changeset	400
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	401
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	402	log --removed file
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	403
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	404	$ hg log --removed -v a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	405	changeset: 3:2ca5ba701980
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	406	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	407	date: Thu Jan 01 00:00:04 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	408	files: a b d g
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	409	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	410	d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	411
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	412
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	413	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	414	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	415	date: Thu Jan 01 00:00:01 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	416	files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	417	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	418	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	419
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	420
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	421
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	422	log --removed revrange file
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	423
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	424	$ hg log --removed -v -r0:2 a
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	425	changeset: 0:9161b9aeaf16
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	426	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	427	date: Thu Jan 01 00:00:01 1970 +0000
16164 18743c4d1989 test-glog: extend a test before fixing --follow issues Patrick Mezard <patrick@mezard.eu> parents: 15725 diff changeset	428	files: a f
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	429	description:
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	430	a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	431
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	432
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	433	$ cd ..
8020 777a9efdae2d log: fix broken multiple user search Henrik Stuart <hg@hstuart.dk> parents: 7762 diff changeset	434
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	435	log --follow tests
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	436
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	437	$ hg init follow
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	438	$ cd follow
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	439
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	440	$ echo base > base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	441	$ hg ci -Ambase -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	442	adding 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	$ echo r1 >> base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	445	$ hg ci -Amr1 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	446	$ echo r2 >> base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	447	$ 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	448
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	449	$ hg up -C 1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	450	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	451	$ echo b1 > b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	452	$ hg ci -Amb1 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	453	adding b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	454	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	455
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	456
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	457	log -f
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	458
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	459	$ hg log -f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	460	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	461	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	462	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	463	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	464	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	465	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	466
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	467	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	468	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	469	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	470	summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	471
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	472	changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	473	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	474	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	475	summary: base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	476
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	477
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	478
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	479	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	480
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	481	$ hg up -C 0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	482	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	483	$ echo b2 > b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	484	$ hg ci -Amb2 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	485	adding b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	486	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	487	$ hg log -f -r 1:tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	488	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	489	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	490	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	491	summary: r1
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	changeset: 2:60c670bf5b30
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	494	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	495	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	496	summary: r2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	497
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	498	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	499	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	500	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	501	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	502	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	503
10957 0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch' Steve Losh <steve@stevelosh.com> parents: 10826 diff changeset	504
10960 ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	505
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	506	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	507
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	508	$ hg up -C 3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	509	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	510	$ hg merge tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	511	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	512	(branch merge, don't forget to commit)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	513	$ hg log -r .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	514	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	515	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	516	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	517	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	518	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	519
10960 ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	520
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078) Steve Losh <steve@stevelosh.com> parents: 10957 diff changeset	521
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	522	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	523
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	524	$ hg ci -mm12 -d '1 0'
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	525	$ hg log -r .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	526	changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	527	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	528	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	529	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	530	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	531	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	532	summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	533
11508 fbab0875fd09 log: fix missing diff output for hg log -p in sub directory Yuya Nishihara <yuya@tcha.org> parents: 11141 diff changeset	534
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	535	$ echo postm >> b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	536	$ 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	537
2eaaad99f2f0 test-log: also test "log -p -R" case Martin Geisler <mg@lazybytes.net> parents: 11508 diff changeset	538
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	539	log --follow-first
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	540
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	541	$ hg log --follow-first
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	542	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	543	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	544	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	545	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	546	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	547
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	548	changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	549	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	550	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	551	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	552	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	553	summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	554
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	555	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	556	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	557	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	558	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	559	summary: b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	560
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	561	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	562	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	563	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	564	summary: r1
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	changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	567	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	568	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	569	summary: base
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	570
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	571
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	572
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	573	log -P 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	574
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	575	$ hg log -P 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	576	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	577	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	578	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	579	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	580	summary: b1.1
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	changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	583	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	584	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	585	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	586	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	587	summary: m12
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: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	590	parent: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	591	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	592	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	593	summary: b2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	594
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	595	changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	596	parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	597	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	598	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	599	summary: b1
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
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	602
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	603	log -r tip -p --git
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	604
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	605	$ hg log -r tip -p --git
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	606	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	607	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	608	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	609	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	610	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	611
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	612	diff --git a/b1 b/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	613	--- a/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	614	+++ b/b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	615	@@ -1,1 +1,2 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	616	b1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	617	+postm
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	618
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	619
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	log -r ""
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	622
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	623	$ hg log -r ''
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	624	hg: parse error: empty query
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	625	[255]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	626
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	627	log -r <some unknown node id>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	628
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	629	$ hg log -r 1000000000000000000000000000000000000000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	630	abort: unknown revision '1000000000000000000000000000000000000000'!
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	631	[255]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	632
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	633	log -k r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	634
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	635	$ hg log -k r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	636	changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	637	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	638	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	639	summary: r1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	640
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	641	log -p -l2 --color=always
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	642
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	643	$ hg --config extensions.color= --config color.mode=ansi \
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	644	> log -p -l2 --color=always
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	645	\x1b[0;33mchangeset: 6:2404bbcab562\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	646	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	647	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	648	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	649	summary: b1.1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	650
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	651	\x1b[0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	652	\x1b[0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	653	\x1b[0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	654	\x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	655	b1
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	656	\x1b[0;32m+postm\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	657
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	658	\x1b[0;33mchangeset: 5:302e9dd6890d\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	659	parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	660	parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	661	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	662	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	663	summary: m12
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	664
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	665	\x1b[0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	666	\x1b[0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	667	\x1b[0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	668	\x1b[0;35m@@ -0,0 +1,1 @@\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12399 diff changeset	669	\x1b[0;32m+b2\x1b[0m (esc)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	670
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	671
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	672
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	673	log -r tip --stat
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	674
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	675	$ hg log -r tip --stat
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	676	changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	677	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	678	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	679	date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	680	summary: b1.1
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	b1 \| 1 +
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	683	1 files changed, 1 insertions(+), 0 deletions(-)
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	684
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	685
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	686	$ cd ..
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	687
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	688
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	689	User
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	690
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	691	$ hg init usertest
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	692	$ cd usertest
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	693
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	694	$ echo a > a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	695	$ 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	696	adding a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	697	$ echo b > b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	698	$ 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	699	adding b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	700
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	701	$ hg log -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	702	changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	703	user: User One <user1@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	704	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	705	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	706
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	707	$ hg log -u "user1" -u "user2"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	708	changeset: 1:e834b5e69c0e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	709	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	710	user: User Two <user2@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	711	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	712	summary: 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	changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	715	user: User One <user1@example.org>
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	716	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	717	summary: a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	718
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	719	$ hg log -u "user3"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	720
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	721	$ cd ..
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	$ hg init branches
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	724	$ cd branches
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	725
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	726	$ echo a > a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	727	$ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	728	adding a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	729	$ hg branch test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	730	marked working directory as branch test
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14645 diff changeset	731	(branches are permanent and global, did you want a bookmark?)
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	732	$ echo b > b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	733	$ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	734	adding b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	735
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	736	$ hg up default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	737	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	738	$ echo c > c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	739	$ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	740	adding c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	741	$ hg up test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	742	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	743	$ echo c > c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	744	$ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	745	adding c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	746
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	747
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	748	log -b default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	749
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	750	$ hg log -b default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	751	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	752	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	753	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	754	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	755	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	756
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	757	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	758	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	759	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	760	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	761
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
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	764	log -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	765
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	766	$ hg log -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	767	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	768	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	769	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	770	parent: 1:d32277701ccb
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 test
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	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	776	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	777	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	778	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	779	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	780
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	781
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	782
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	783	log -b dummy
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	784
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	785	$ hg log -b dummy
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	786	abort: unknown revision 'dummy'!
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	787	[255]
11900 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
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	790	log -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	791
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	792	$ hg log -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	793	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	794	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	795	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	796	parent: 1:d32277701ccb
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 test
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	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	802	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	803	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	804	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	805	summary: commit on test
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
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	808
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	809	log -b default -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	810
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	811	$ hg log -b default -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	812	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	813	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	814	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	815	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	816	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	817	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	818	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	819
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	820	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	821	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	822	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	823	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	824	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	825
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	826	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	827	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	828	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	829	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	830	summary: commit on test
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	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	833	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	834	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	835	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	836
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	837
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	838
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	839	log -b default -b .
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	$ hg log -b default -b .
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	842	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	843	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	844	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	845	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	846	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	847	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	848	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	849
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	850	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	851	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	852	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	853	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	854	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	856	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	857	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	858	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	859	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	860	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	861
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	862	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	863	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	864	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	865	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	866
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	867
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	868
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	869	log -b . -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	870
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	871	$ hg log -b . -b test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	872	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	873	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	874	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	875	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	876	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	877	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	878	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	879
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	880	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	881	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	882	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	883	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	884	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	885
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	886
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	887
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	888	log -b 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	889
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	890	$ hg log -b 2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	891	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	892	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	893	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	894	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	895	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	896
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	897	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	898	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	899	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	900	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	901
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	902
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	903
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	904	log -p --cwd dir (in subdir)
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	$ mkdir dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	907	$ hg log -p --cwd dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	908	changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	909	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	910	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	911	parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	912	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	913	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	914	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	915
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	916	diff -r d32277701ccb -r f5d8de11c2e2 c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	917	--- /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	918	+++ 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	919	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	920	+c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	921
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	922	changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	923	parent: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	924	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	925	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	926	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	927
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	928	diff -r 24427303d56f -r c3a4f03cc9a7 c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	929	--- /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	930	+++ 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	931	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	932	+c
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	933
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	934	changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	935	branch: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	936	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	937	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	938	summary: commit on test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	939
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	940	diff -r 24427303d56f -r d32277701ccb b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	941	--- /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	942	+++ 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	943	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	944	+b
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	945
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	946	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	947	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	948	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	949	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	950
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	951	diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	952	--- /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	953	+++ 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	954	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	955	+a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	956
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	957
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	log -p -R repo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	960
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	961	$ cd dir
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	962	$ hg log -p -R .. ../a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	963	changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	964	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	965	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	966	summary: commit on default
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	967
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	968	diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	969	--- /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	970	+++ 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	971	@@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	972	+a
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
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	975	$ cd ../..
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	976
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	977	$ hg init follow2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	978	$ cd follow2
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	979
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	980	# 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	981	# 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	982	# \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	983	# 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	984	# \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	985	# o
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	986	#
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	987	# 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	988	# "x" is a revision without "foo"
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	989
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	990	$ touch init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	991	$ hg ci -A -m "init, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	992	adding init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	993	$ echo 'foo' > init
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	994	$ hg ci -m "change, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	995	$ echo 'foo' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	996	$ hg ci -A -m "add unrelated old foo"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	997	adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	998	$ hg rm foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	999	$ hg ci -m "delete foo, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1000	$ echo 'related' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1001	$ hg ci -A -m "add foo, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1002	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	1003
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1004	$ hg up 0
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1005	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	1006	$ touch branch
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1007	$ hg ci -A -m "first branch, unrelated"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1008	adding branch
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1009	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1010	$ touch foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1011	$ hg ci -A -m "create foo, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1012	adding foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1013	$ echo 'change' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1014	$ hg ci -m "change foo, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1015
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1016	$ hg up 6
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1017	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	1018	$ echo 'change foo in branch' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1019	$ hg ci -m "change foo in branch, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1020	created new head
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1021	$ hg merge 7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1022	merging foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1023	warning: conflicts during merge.
15501 2371f4aea665 merge: give a special message for internal:merge failure (issue3105) Matt Mackall <mpm@selenic.com> parents: 15442 diff changeset	1024	merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1025	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	1026	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	1027	[1]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1028	$ echo 'merge 1' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1029	$ hg resolve -m foo
21267 e4f451c8c05c resolve: simplify "finished" message Matt Mackall <mpm@selenic.com> parents: 21266 diff changeset	1030	no more unresolved files
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1031	$ hg ci -m "First merge, related"
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1032
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1033	$ hg merge 4
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1034	merging foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1035	warning: conflicts during merge.
15501 2371f4aea665 merge: give a special message for internal:merge failure (issue3105) Matt Mackall <mpm@selenic.com> parents: 15442 diff changeset	1036	merging foo incomplete! (edit conflicts, then use 'hg resolve --mark')
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1037	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	1038	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12314 diff changeset	1039	[1]
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1040	$ echo 'merge 2' > foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1041	$ hg resolve -m foo
21267 e4f451c8c05c resolve: simplify "finished" message Matt Mackall <mpm@selenic.com> parents: 21266 diff changeset	1042	no more unresolved files
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1043	$ 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	1044
17181 6f71167292f2 log: support --graph without graphlog extension Patrick Mezard <patrick@mezard.eu> parents: 16923 diff changeset	1045	$ hg log --graph
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1046	@ changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1047	\|\ tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1048	\| \| parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1049	\| \| parent: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1050	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1051	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1052	\| \| summary: Last merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1053	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1054	\| o changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1055	\| \|\ parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1056	\| \| \| parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1057	\| \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1058	\| \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1059	\| \| \| summary: First merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1060	\| \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1061	\| \| o changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1062	\| \| \| parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1063	\| \| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1064	\| \| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1065	\| \| \| summary: change foo in branch, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1066	\| \| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1067	\| o \| changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1068	\| \|/ user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1069	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1070	\| \| summary: change foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1071	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1072	\| o changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1073	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1074	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1075	\| \| summary: create foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1076	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1077	\| o changeset: 5:73db34516eb9
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1078	\| \| parent: 0:e87515fd044a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1079	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1080	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1081	\| \| summary: first branch, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1082	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1083	o \| changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1084	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1085	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1086	\| \| summary: add foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1087	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1088	o \| changeset: 3:dd78ae4afb56
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1089	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1090	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1091	\| \| summary: delete foo, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1092	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1093	o \| changeset: 2:c4c64aedf0f7
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1094	\| \| user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1095	\| \| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1096	\| \| summary: add unrelated old foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1097	\| \|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1098	o \| changeset: 1:e5faa7440653
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1099	\|/ user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1100	\| date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1101	\| summary: change, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1102	\|
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1103	o changeset: 0:e87515fd044a
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1104	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1105	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1106	summary: init, unrelated
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1107
11899 99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11631 diff changeset	1108
11900 cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1109	$ hg --traceback log -f foo
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1110	changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1111	tag: tip
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1112	parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1113	parent: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1114	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1115	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1116	summary: Last merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1117
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1118	changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1119	parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1120	parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1121	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1122	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1123	summary: First merge, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1124
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1125	changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1126	parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1127	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1128	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1129	summary: change foo in branch, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1130
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1131	changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1132	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1133	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1134	summary: change foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1135
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1136	changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1137	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1138	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1139	summary: create foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1140
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1141	changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1142	user: test
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1143	date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1144	summary: add foo, related
cd7182358d9f tests: unify test-log Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 11899 diff changeset	1145
12383 f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1146
12972 7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1147	Also check when maxrev < lastrevfilelog
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1148
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1149	$ hg --traceback log -f -r4 foo
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1150	changeset: 4:88176d361b69
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1151	user: test
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1152	date: Thu Jan 01 00:00:00 1970 +0000
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1153	summary: add foo, related
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1154
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1155	$ cd ..
12972 7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1156
12399 4fee1fd3de9a tests: added a short description to issue numbers Martin Geisler <mg@aragost.com> parents: 12383 diff changeset	1157	Issue2383: hg log showing _less_ differences than hg diff
12383 f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1158
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1159	$ hg init issue2383
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1160	$ cd issue2383
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1161
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1162	Create a test repo:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1163
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1164	$ echo a > a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1165	$ hg ci -Am0
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1166	adding a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1167	$ echo b > b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1168	$ hg ci -Am1
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1169	adding b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1170	$ hg co 0
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1171	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1172	$ echo b > a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1173	$ hg ci -m2
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1174	created new head
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1175
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1176	Merge:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1177
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1178	$ hg merge
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1179	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1180	(branch merge, don't forget to commit)
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1181
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1182	Make sure there's a file listed in the merge to trigger the bug:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1183
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1184	$ echo c > a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1185	$ hg ci -m3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1186
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1187	Two files shown here in diff:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1188
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1189	$ hg diff --rev 2:3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1190	diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1191	--- a/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1192	+++ b/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1193	@@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1194	-b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1195	+c
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1196	diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1197	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1198	+++ b/b Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1199	@@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1200	+b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1201
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1202	Diff here should be the same:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1203
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1204	$ hg log -vpr 3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1205	changeset: 3:8e07aafe1edc
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1206	tag: tip
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1207	parent: 2:b09be438c43a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1208	parent: 1:925d80f479bb
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1209	user: test
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1210	date: Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1211	files: a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1212	description:
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1213	3
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1214
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1215
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1216	diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1217	--- a/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1218	+++ b/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1219	@@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1220	-b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1221	+c
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1222	diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1223	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1224	+++ b/b Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1225	@@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1226	+b
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1227
f1e8d6f6e682 merge with stable Mads Kiilerich <mads@kiilerich.com> parents: 12382 12328 diff changeset	1228	$ cd ..
12972 7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1229
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1230	'hg log -r rev fn' when last(filelog(fn)) != rev
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1231
16912 6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1232	$ hg init simplelog
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories Mads Kiilerich <mads@kiilerich.com> parents: 16887 diff changeset	1233	$ cd simplelog
12972 7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1234	$ echo f > a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1235	$ hg ci -Am'a' -d '0 0'
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1236	adding a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1237	$ echo f >> a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1238	$ hg ci -Am'a bis' -d '1 0'
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1239
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1240	$ hg log -r0 a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1241	changeset: 0:9f758d63dcde
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1242	user: test
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1243	date: Thu Jan 01 00:00:00 1970 +0000
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1244	summary: a
7916a84c0758 log: fix log -rREV FILE when REV isnt the last filerev (issue2492) Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 12942 diff changeset	1245
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1246	enable obsolete to test hidden feature
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1247
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1248	$ cat > ${TESTTMP}/obs.py << EOF
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1249	> import mercurial.obsolete
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1250	> mercurial.obsolete._enabled = True
14645 e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1251	> EOF
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1252	$ echo '[extensions]' >> $HGRCPATH
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1253	$ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1254
14645 e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1255	$ hg log --template='{rev}:{node}\n'
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1256	1:a765632148dc55d38c35c4f247c618701886cb2f
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1257	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1258	$ hg debugobsolete a765632148dc55d38c35c4f247c618701886cb2f
f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1259	$ hg up null -q
14645 e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1260	$ hg log --template='{rev}:{node}\n'
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1261	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1262	$ hg log --template='{rev}:{node}\n' --hidden
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1263	1:a765632148dc55d38c35c4f247c618701886cb2f
e4cfdff6d3f4 log: do not display hidden changeset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 13889 diff changeset	1264	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
19471 fd1bb7c1be78 revlog: handle hidden revs in _partialmatch (issue3979) Matt Mackall <mpm@selenic.com> parents: 19127 diff changeset	1265	$ hg log -r a
fd1bb7c1be78 revlog: handle hidden revs in _partialmatch (issue3979) Matt Mackall <mpm@selenic.com> parents: 19127 diff changeset	1266	abort: unknown revision 'a'!
fd1bb7c1be78 revlog: handle hidden revs in _partialmatch (issue3979) Matt Mackall <mpm@selenic.com> parents: 19127 diff changeset	1267	[255]
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1268
18250 f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1269	test that parent prevent a changeset to be hidden
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1270
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18250 diff changeset	1271	$ hg up 1 -q --hidden
18250 f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1272	$ hg log --template='{rev}:{node}\n'
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1273	1:a765632148dc55d38c35c4f247c618701886cb2f
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1274	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1275
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1276	test that second parent prevent a changeset to be hidden too
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1277
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1278	$ hg debugsetparents 0 1 # nothing suitable to merge here
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1279	$ hg log --template='{rev}:{node}\n'
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1280	1:a765632148dc55d38c35c4f247c618701886cb2f
f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1281	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18494 e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1282	$ hg debugsetparents 1
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1283	$ hg up -q null
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1284
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1285	bookmarks prevent a changeset being hidden
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1286
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1287	$ hg bookmark --hidden -r 1 X
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1288	$ hg log --template '{rev}:{node}\n'
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1289	1:a765632148dc55d38c35c4f247c618701886cb2f
e945bcb87973 filtering: test that bookmarks prevent hiding of changesets Kevin Bullock <kbullock@ringworld.org> parents: 18468 diff changeset	1290	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18495 8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1291	$ hg bookmark -d X
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1292
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1293	divergent bookmarks are not hidden
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1294
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1295	$ hg bookmark --hidden -r 1 X@foo
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1296	$ hg log --template '{rev}:{node}\n'
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1297	1:a765632148dc55d38c35c4f247c618701886cb2f
8260fa9f30b9 bookmarks: don't use bookmarks.listbookmarks in local computations Kevin Bullock <kbullock@ringworld.org> parents: 18494 diff changeset	1298	0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
18250 f54898526aad hidden: use both parents of working directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18208 diff changeset	1299
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1300	clear extensions configuration
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1301	$ echo '[extensions]' >> $HGRCPATH
18208 f0059ba239cb test: use obsolescence marker to test hidden Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 17781 diff changeset	1302	$ echo "obs=!" >> $HGRCPATH
15725 988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1303	$ cd ..
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1304
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1305	test -u/-k for problematic encoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1306	# unicode: cp932:
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1307	# u30A2 0x83 0x41(= 'A')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1308	# u30C2 0x83 0x61(= 'a')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1309
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1310	$ hg init problematicencoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1311	$ cd problematicencoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1312
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1313	$ python > setup.sh <<EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1314	> print u'''
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1315	> echo a > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1316	> hg add text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1317	> hg --encoding utf-8 commit -u '\u30A2' -m none
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1318	> echo b > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1319	> hg --encoding utf-8 commit -u '\u30C2' -m none
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1320	> echo c > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1321	> hg --encoding utf-8 commit -u none -m '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1322	> echo d > text
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1323	> hg --encoding utf-8 commit -u none -m '\u30C2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1324	> '''.encode('utf-8')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1325	> EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1326	$ sh < setup.sh
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1327
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1328	test in problematic encoding
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1329	$ python > test.sh <<EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1330	> print u'''
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1331	> hg --encoding cp932 log --template '{rev}\\n' -u '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1332	> echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1333	> hg --encoding cp932 log --template '{rev}\\n' -u '\u30C2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1334	> echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1335	> hg --encoding cp932 log --template '{rev}\\n' -k '\u30A2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1336	> echo ====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1337	> hg --encoding cp932 log --template '{rev}\\n' -k '\u30C2'
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1338	> '''.encode('cp932')
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1339	> EOF
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1340	$ sh < test.sh
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1341	0
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1342	====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1343	1
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1344	====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1345	2
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1346	0
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1347	====
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1348	3
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1349	1
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1350
988409e44a76 i18n: use "encoding.lower()" to normalize specified keywords for log searching FUJIWARA Katsunori <foozy@lares.dti.ne.jp> parents: 15623 diff changeset	1351	$ cd ..
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1352
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1353	test hg log on non-existent files and on directories
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1354	$ hg init issue1340
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1355	$ cd issue1340
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1356	$ mkdir d1; mkdir D2; mkdir D3.i; mkdir d4.hg; mkdir d5.d; mkdir .d6
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1357	$ echo 1 > d1/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1358	$ echo 1 > D2/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1359	$ echo 1 > D3.i/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1360	$ echo 1 > d4.hg/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1361	$ echo 1 > d5.d/f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1362	$ echo 1 > .d6/f1
17781 8ce535745500 test-log: fix / vs \ issues on Windows introduced with 6d218e47cf9b Adrian Buehlmann <adrian@cadifra.com> parents: 17746 diff changeset	1363	$ hg -q add .
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1364	$ hg commit -m "a bunch of weird directories"
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1365	$ hg log -l1 d1/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1366	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1367	$ hg log -l1 f1
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1368	$ hg log -l1 . \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1369	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1370	$ hg log -l1 ./ \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1371	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1372	$ hg log -l1 d1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1373	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1374	$ hg log -l1 D2 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1375	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1376	$ hg log -l1 D2/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1377	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1378	$ hg log -l1 D3.i \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1379	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1380	$ hg log -l1 D3.i/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1381	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1382	$ hg log -l1 d4.hg \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1383	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1384	$ hg log -l1 d4.hg/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1385	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1386	$ hg log -l1 d5.d \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1387	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1388	$ hg log -l1 d5.d/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1389	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1390	$ hg log -l1 .d6 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1391	changeset: 0:65624cd9070a
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1392	$ hg log -l1 .d6/f1 \| grep changeset
6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1393	changeset: 0:65624cd9070a
18466 ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1394
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1395	issue3772: hg log -r :null showing revision 0 as well
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1396
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1397	$ hg log -r :null
20699 58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1398	changeset: 0:65624cd9070a
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1399	tag: tip
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1400	user: test
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1401	date: Thu Jan 01 00:00:00 1970 +0000
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1402	summary: a bunch of weird directories
58c32a9c8e7b hg log: solves bug regarding hg log -r 0:null (issue4039) Cristian Zamfir <cristi_zmf@yahoo.com> parents: 19471 diff changeset	1403
18466 ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1404	changeset: -1:000000000000
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1405	user:
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1406	date: Thu Jan 01 00:00:00 1970 +0000
ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1407
18468 275224c6e89c tests: add regression tests for another revrange edge case Kevin Bullock <kbullock@ringworld.org> parents: 18466 diff changeset	1408	$ hg log -r null:null
275224c6e89c tests: add regression tests for another revrange edge case Kevin Bullock <kbullock@ringworld.org> parents: 18466 diff changeset	1409	changeset: -1:000000000000
275224c6e89c tests: add regression tests for another revrange edge case Kevin Bullock <kbullock@ringworld.org> parents: 18466 diff changeset	1410	user:
275224c6e89c tests: add regression tests for another revrange edge case Kevin Bullock <kbullock@ringworld.org> parents: 18466 diff changeset	1411	date: Thu Jan 01 00:00:00 1970 +0000
275224c6e89c tests: add regression tests for another revrange edge case Kevin Bullock <kbullock@ringworld.org> parents: 18466 diff changeset	1412
18466 ac0c12123743 log: remove any ancestors of nullrev (issue3772) Sean Farley <sean.michael.farley@gmail.com> parents: 18340 diff changeset	1413
17746 6d218e47cf9b log: speed up hg log for untracked files (issue1340) smuralid parents: 17207 diff changeset	1414	$ cd ..

author	Matt Mackall <mpm@selenic.com>
	Wed, 16 Jul 2014 17:35:04 -0500
changeset 21877	dbbae63865a6
parent 21267	e4f451c8c05c
parent 21876	584bbfd1b50d
child 21947	b081decd9062
permissions	-rw-r--r--