Show More
@@ -712,8 +712,7 b' def log(ui, repo, f=None, **opts):' | |||
|
712 | 712 | changenode = repo.changelog.node(i) |
|
713 | 713 | prev, other = repo.changelog.parents(changenode) |
|
714 | 714 | dodiff(sys.stdout, ui, repo, files, prev, changenode) |
|
715 | ui.write("\n") | |
|
716 | ui.write("\n") | |
|
715 | ui.write("\n\n") | |
|
717 | 716 | |
|
718 | 717 | def manifest(ui, repo, rev = []): |
|
719 | 718 | """output the latest or given revision of the project manifest""" |
@@ -11,7 +11,6 b' user: test' | |||
|
11 | 11 | date: Thu Jan 1 00:00:00 1970 |
|
12 | 12 | summary: test |
|
13 | 13 | |
|
14 | ||
|
15 | 14 | + hg manifest |
|
16 | 15 | b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a |
|
17 | 16 | + hg cat a |
@@ -19,20 +19,17 b' user: test' | |||
|
19 | 19 | date: Thu Jan 1 00:00:00 1970 |
|
20 | 20 | summary: 2 |
|
21 | 21 | |
|
22 | ||
|
23 | 22 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
24 | 23 | user: test |
|
25 | 24 | date: Thu Jan 1 00:00:00 1970 |
|
26 | 25 | summary: 1 |
|
27 | 26 | |
|
28 | ||
|
29 | 27 | + hg log a |
|
30 | 28 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
31 | 29 | user: test |
|
32 | 30 | date: Thu Jan 1 00:00:00 1970 |
|
33 | 31 | summary: 1 |
|
34 | 32 | |
|
35 | ||
|
36 | 33 | + hexdump -C .hg/data/b.d |
|
37 | 34 | 00000000 75 01 0a 63 6f 70 79 72 65 76 3a 20 62 37 38 39 |u..copyrev: b789| |
|
38 | 35 | 00000010 66 64 64 39 36 64 63 32 66 33 62 64 32 32 39 63 |fdd96dc2f3bd229c| |
@@ -52,19 +52,16 b' user: test' | |||
|
52 | 52 | date: Thu Jan 1 00:00:00 1970 |
|
53 | 53 | summary: chmod +x a |
|
54 | 54 | |
|
55 | ||
|
56 | 55 | changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 |
|
57 | 56 | user: test |
|
58 | 57 | date: Thu Jan 1 00:00:00 1970 |
|
59 | 58 | summary: a updated |
|
60 | 59 | |
|
61 | ||
|
62 | 60 | changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 |
|
63 | 61 | user: test |
|
64 | 62 | date: Thu Jan 1 00:00:00 1970 |
|
65 | 63 | summary: added a b |
|
66 | 64 | |
|
67 | ||
|
68 | 65 | + hg -v co -m |
|
69 | 66 | resolving manifests |
|
70 | 67 | merging a |
@@ -9,7 +9,6 b' user: test' | |||
|
9 | 9 | date: Thu Jan 1 00:00:00 1970 |
|
10 | 10 | summary: test |
|
11 | 11 | |
|
12 | ||
|
13 | 12 | + hg tag -u test -d '0 0' bleah |
|
14 | 13 | + hg history |
|
15 | 14 | changeset: 1:863197ef03781c4fc00276d83eb66c4cb9cd91df |
@@ -18,14 +17,12 b' user: test' | |||
|
18 | 17 | date: Thu Jan 1 00:00:00 1970 |
|
19 | 18 | summary: Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
20 | 19 | |
|
21 | ||
|
22 | 20 | changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376 |
|
23 | 21 | tag: bleah |
|
24 | 22 | user: test |
|
25 | 23 | date: Thu Jan 1 00:00:00 1970 |
|
26 | 24 | summary: test |
|
27 | 25 | |
|
28 | ||
|
29 | 26 | + echo foo |
|
30 | 27 | + hg tag -u test -d '0 0' bleah2 |
|
31 | 28 | abort: working copy of .hgtags is changed! |
@@ -57,7 +57,6 b' description:' | |||
|
57 | 57 | 2 |
|
58 | 58 | |
|
59 | 59 | |
|
60 | ||
|
61 | 60 | changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e |
|
62 | 61 | manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0 |
|
63 | 62 | user: test |
@@ -67,7 +66,6 b' description:' | |||
|
67 | 66 | 1 |
|
68 | 67 | |
|
69 | 68 | |
|
70 | ||
|
71 | 69 | + hg diff |
|
72 | 70 | + sed 's/\(\(---\|+++\).*\)\t.*/\1/' |
|
73 | 71 | diff -r 1e71731e6fbb a |
General Comments 0
You need to be logged in to leave comments.
Login now