Mercurial: tests/test-log.out annotate

annotate tests/test-log.out @ 7460:3342e6ada4b9

push: use the fast changegroup() path on push The race doesn't happen on push (because the discovery is done in the same hg process), so use the fast path instead.

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date	Tue, 02 Dec 2008 19:36:43 +0100
parents	07cb58b8c843
children	fece056bf240

rev	line source
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	1 adding a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	2 changeset: 0:8580ff50825a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	3 user: test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	4 date: Thu Jan 01 00:00:01 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	5 summary: a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	6
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	7 % -f, directory
7404 07cb58b8c843 Improved error message for log --follow Brendan Cully <brendan@kublai.com> parents: 7062 diff changeset	8 abort: cannot follow nonexistent file: "dir"
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	9 % -f, but no args
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	10 changeset: 4:b30c444c7c84
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	11 tag: tip
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	12 user: test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	13 date: Thu Jan 01 00:00:05 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	14 summary: e
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	15
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	16 changeset: 3:16b60bf3f99a
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	17 user: test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	18 date: Thu Jan 01 00:00:04 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	19 summary: d
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	20
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	21 changeset: 2:21fba396af4c
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	22 user: test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	23 date: Thu Jan 01 00:00:03 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	24 summary: c
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	25
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	26 changeset: 1:c0296dabce9b
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	27 user: test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	28 date: Thu Jan 01 00:00:02 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	29 summary: b
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	30
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	31 changeset: 0:8580ff50825a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	32 user: test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	33 date: Thu Jan 01 00:00:01 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	34 summary: a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	35
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	36 % one rename
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2901 diff changeset	37 changeset: 0:8580ff50825a
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	38 user: test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	39 date: Thu Jan 01 00:00:01 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	40 files: a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	41 description:
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	42 a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	43
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	44
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	45 % many renames
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	46 changeset: 4:b30c444c7c84
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	47 tag: tip
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	48 user: test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	49 date: Thu Jan 01 00:00:05 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	50 files: dir/b e
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	51 description:
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	52 e
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	53
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	54
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2901 diff changeset	55 changeset: 2:21fba396af4c
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	56 user: test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	57 date: Thu Jan 01 00:00:03 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	58 files: b dir/b
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	59 description:
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	60 c
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	61
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	62
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2901 diff changeset	63 changeset: 1:c0296dabce9b
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	64 user: test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	65 date: Thu Jan 01 00:00:02 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	66 files: b
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	67 description:
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	68 b
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	69
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	70
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2901 diff changeset	71 changeset: 0:8580ff50825a
2741 ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	72 user: test
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	73 date: Thu Jan 01 00:00:01 1970 +0000
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	74 files: a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	75 description:
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	76 a
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	77
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy Vadim Gelfer <vadim.gelfer@gmail.com> parents: diff changeset	78
3197 e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2966 diff changeset	79 % log copies
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2966 diff changeset	80 4 e (dir/b)
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2966 diff changeset	81 3 b (a)
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2966 diff changeset	82 2 dir/b (b)
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2966 diff changeset	83 1 b (a)
e18c3d08528d Show copies in hg log. Brendan Cully <brendan@kublai.com> parents: 2966 diff changeset	84 0
3383 c7c6f1a45348 Test case for log --copies on non-linear manifests (issue391) Brendan Cully <brendan@kublai.com> parents: 3197 diff changeset	85 % log copies, non-linear manifest
c7c6f1a45348 Test case for log --copies on non-linear manifests (issue391) Brendan Cully <brendan@kublai.com> parents: 3197 diff changeset	86 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
c7c6f1a45348 Test case for log --copies on non-linear manifests (issue391) Brendan Cully <brendan@kublai.com> parents: 3197 diff changeset	87 adding foo
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6228 diff changeset	88 created new head
3383 c7c6f1a45348 Test case for log --copies on non-linear manifests (issue391) Brendan Cully <brendan@kublai.com> parents: 3197 diff changeset	89 5 e (dir/b)
5811 180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 4510 diff changeset	90 % log copies, execute bit set
180a3eee4b75 Fix copies reporting in log and convert. Maxim Dounin <mdounin@mdounin.ru> parents: 4510 diff changeset	91 6
3837 7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	92 % log -p d
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	93 changeset: 3:16b60bf3f99a
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	94 user: test
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	95 date: Thu Jan 01 00:00:04 1970 +0000
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	96 files: a b d
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	97 description:
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	98 d
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	99
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	100
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	101 diff -r 21fba396af4c -r 16b60bf3f99a d
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	102 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	103 +++ b/d Thu Jan 01 00:00:04 1970 +0000
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	104 @@ -0,0 +1,1 @@
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	105 +a
7df171ea50cd Fix log regression where log -p file showed diffs for other files Matt Mackall <mpm@selenic.com> parents: 3718 diff changeset	106
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	107 adding base
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	108 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	109 adding b1
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6228 diff changeset	110 created new head
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	111 % log -f
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	112 changeset: 3:e62f78d544b4
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	113 tag: tip
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	114 parent: 1:3d5bf5654eda
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	115 user: test
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	116 date: Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	117 summary: b1
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	118
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	119 changeset: 1:3d5bf5654eda
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	120 user: test
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	121 date: Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	122 summary: r1
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	123
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	124 changeset: 0:67e992f2c4f3
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	125 user: test
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	126 date: Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	127 summary: base
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	128
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	129 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	130 adding b2
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6228 diff changeset	131 created new head
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	132 % log -f -r 1:tip
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	133 changeset: 1:3d5bf5654eda
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	134 user: test
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	135 date: Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	136 summary: r1
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	137
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	138 changeset: 2:60c670bf5b30
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	139 user: test
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	140 date: Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	141 summary: r2
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	142
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	143 changeset: 3:e62f78d544b4
f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	144 parent: 1:3d5bf5654eda
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	145 user: test
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	146 date: Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	147 summary: b1
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	148
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	149 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	150 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	151 (branch merge, don't forget to commit)
4510 e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	152 % log -r . with two parents
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	153 changeset: 3:e62f78d544b4
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	154 parent: 1:3d5bf5654eda
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	155 user: test
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	156 date: Thu Jan 01 00:00:01 1970 +0000
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	157 summary: b1
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	158
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	159 % log -r . with one parent
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	160 changeset: 5:302e9dd6890d
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	161 tag: tip
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	162 parent: 3:e62f78d544b4
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	163 parent: 4:ddb82e70d1a1
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	164 user: test
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	165 date: Thu Jan 01 00:00:01 1970 +0000
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	166 summary: m12
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 4180 diff changeset	167
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	168 % log --follow-first
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	169 changeset: 6:2404bbcab562
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	170 tag: tip
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	171 user: test
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	172 date: Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	173 summary: b1.1
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	174
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	175 changeset: 5:302e9dd6890d
f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	176 parent: 3:e62f78d544b4
f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	177 parent: 4:ddb82e70d1a1
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	178 user: test
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	179 date: Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	180 summary: m12
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	181
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	182 changeset: 3:e62f78d544b4
f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	183 parent: 1:3d5bf5654eda
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	184 user: test
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	185 date: Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	186 summary: b1
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	187
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	188 changeset: 1:3d5bf5654eda
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	189 user: test
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	190 date: Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	191 summary: r1
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	192
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	193 changeset: 0:67e992f2c4f3
2785 e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	194 user: test
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	195 date: Thu Jan 01 00:00:01 1970 +0000
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	196 summary: base
e7f70588af30 Test suite for log --follow and --follow-first. Brendan Cully <brendan@kublai.com> parents: 2741 diff changeset	197
2901 9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	198 % log -P 2
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	199 changeset: 6:2404bbcab562
2901 9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	200 tag: tip
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	201 user: test
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	202 date: Thu Jan 01 00:00:01 1970 +0000
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	203 summary: b1.1
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	204
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	205 changeset: 5:302e9dd6890d
f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	206 parent: 3:e62f78d544b4
f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	207 parent: 4:ddb82e70d1a1
2901 9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	208 user: test
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	209 date: Thu Jan 01 00:00:01 1970 +0000
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	210 summary: m12
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	211
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	212 changeset: 4:ddb82e70d1a1
f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	213 parent: 0:67e992f2c4f3
2901 9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	214 user: test
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	215 date: Thu Jan 01 00:00:01 1970 +0000
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	216 summary: b2
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	217
4180 f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	218 changeset: 3:e62f78d544b4
f80cf8b7bbd9 Remove dummy branch hack from tests Matt Mackall <mpm@selenic.com> parents: 4167 diff changeset	219 parent: 1:3d5bf5654eda
2901 9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	220 user: test
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	221 date: Thu Jan 01 00:00:01 1970 +0000
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	222 summary: b1
9826af4841ef Test for log --prune. Brendan Cully <brendan@kublai.com> parents: 2785 diff changeset	223
3718 7db88b094b14 fix hg log -r '' Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3383 diff changeset	224 % log -r ""
6228 c0c4c7b1e8d3 revlog: report node and file when lookup fails Matt Mackall <mpm@selenic.com> parents: 5811 diff changeset	225 abort: 00changelog.i@: ambiguous identifier!
7062 efc579fdaf69 provide nicer feedback when an unknown node id is passed to a command Sune Foldager <cryo@cyanite.org> parents: 6736 diff changeset	226 % log -r <some unknown node id>
efc579fdaf69 provide nicer feedback when an unknown node id is passed to a command Sune Foldager <cryo@cyanite.org> parents: 6736 diff changeset	227 abort: unknown revision '1000000000000000000000000000000000000000'!

Mercurial > hg

annotate tests/test-log.out @ 7460:3342e6ada4b9