##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

change tests to use simplemerge by default
change tests to use simplemerge by default
Matt Mackall - - Load All Authors

File last commit:

r4180:f80cf8b7 default
r4365:46280c00 default
Show More
test-log.out
204 lines | 4.2 KiB | text/plain | TextLexer
/ tests / test-log.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
log: add -f/--follow option, to follow rename/copy
 r2741 adding a
changeset: 0:8580ff50825a
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
% -f, directory
abort: can only follow copies/renames for explicit file names
% -f, but no args
Matt Mackall
Fix log regression where log -p file showed diffs for other files
 r3837 changeset: 4:b30c444c7c84
Vadim Gelfer
log: add -f/--follow option, to follow rename/copy
 r2741 tag: tip
user: test
date: Thu Jan 01 00:00:05 1970 +0000
summary: e
Matt Mackall
Fix log regression where log -p file showed diffs for other files
 r3837 changeset: 3:16b60bf3f99a
Vadim Gelfer
log: add -f/--follow option, to follow rename/copy
 r2741 user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: d
changeset: 2:21fba396af4c
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: c
changeset: 1:c0296dabce9b
user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: b
changeset: 0:8580ff50825a
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: a
% one rename
Matt Mackall
Only show long hashes with --debug, not --verbose
 r2966 changeset: 0:8580ff50825a
Vadim Gelfer
log: add -f/--follow option, to follow rename/copy
 r2741 user: test
date: Thu Jan 01 00:00:01 1970 +0000
files: a
description:
a
% many renames
Matt Mackall
Fix log regression where log -p file showed diffs for other files
 r3837 changeset: 4:b30c444c7c84
Vadim Gelfer
log: add -f/--follow option, to follow rename/copy
 r2741 tag: tip
user: test
date: Thu Jan 01 00:00:05 1970 +0000
files: dir/b e
description:
e
Matt Mackall
Only show long hashes with --debug, not --verbose
 r2966 changeset: 2:21fba396af4c
Vadim Gelfer
log: add -f/--follow option, to follow rename/copy
 r2741 user: test
date: Thu Jan 01 00:00:03 1970 +0000
files: b dir/b
description:
c
Matt Mackall
Only show long hashes with --debug, not --verbose
 r2966 changeset: 1:c0296dabce9b
Vadim Gelfer
log: add -f/--follow option, to follow rename/copy
 r2741 user: test
date: Thu Jan 01 00:00:02 1970 +0000
files: b
description:
b
Matt Mackall
Only show long hashes with --debug, not --verbose
 r2966 changeset: 0:8580ff50825a
Vadim Gelfer
log: add -f/--follow option, to follow rename/copy
 r2741 user: test
date: Thu Jan 01 00:00:01 1970 +0000
files: a
description:
a
Brendan Cully
Show copies in hg log....
 r3197 % log copies
4 e (dir/b)
3 b (a)
2 dir/b (b)
1 b (a)
0
Brendan Cully
Test case for log --copies on non-linear manifests (issue391)
 r3383 % log copies, non-linear manifest
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding foo
5 e (dir/b)
Matt Mackall
Fix log regression where log -p file showed diffs for other files
 r3837 % log -p d
changeset: 3:16b60bf3f99a
user: test
date: Thu Jan 01 00:00:04 1970 +0000
files: a b d
description:
d
diff -r 21fba396af4c -r 16b60bf3f99a d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/d Thu Jan 01 00:00:04 1970 +0000
@@ -0,0 +1,1 @@
+a
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 adding base
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b1
% log -f
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 3:e62f78d544b4
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 tag: tip
Matt Mackall
Remove dummy branch hack from tests
 r4180 parent: 1:3d5bf5654eda
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 1:3d5bf5654eda
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 0:67e992f2c4f3
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: base
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding b2
% log -f -r 1:tip
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 1:3d5bf5654eda
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 2:60c670bf5b30
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: r2
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 3:e62f78d544b4
parent: 1:3d5bf5654eda
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% log --follow-first
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 6:2404bbcab562
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1.1
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 5:302e9dd6890d
parent: 3:e62f78d544b4
parent: 4:ddb82e70d1a1
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: m12
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 3:e62f78d544b4
parent: 1:3d5bf5654eda
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 1:3d5bf5654eda
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: r1
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 0:67e992f2c4f3
Brendan Cully
Test suite for log --follow and --follow-first.
 r2785 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: base
Brendan Cully
Test for log --prune.
 r2901 % log -P 2
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 6:2404bbcab562
Brendan Cully
Test for log --prune.
 r2901 tag: tip
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1.1
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 5:302e9dd6890d
parent: 3:e62f78d544b4
parent: 4:ddb82e70d1a1
Brendan Cully
Test for log --prune.
 r2901 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: m12
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 4:ddb82e70d1a1
parent: 0:67e992f2c4f3
Brendan Cully
Test for log --prune.
 r2901 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b2
Matt Mackall
Remove dummy branch hack from tests
 r4180 changeset: 3:e62f78d544b4
parent: 1:3d5bf5654eda
Brendan Cully
Test for log --prune.
 r2901 user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: b1
Alexis S. L. Carvalho
fix hg log -r ''
 r3718 % log -r ""
abort: Ambiguous identifier!