equal
deleted
inserted
replaced
1 $ alias hglog='hg log --template "{rev} {phase} {desc}\n"' |
1 $ alias hglog='hg log --template "{rev} {phase} {desc}\n"' |
2 $ mkcommit() { |
2 $ mkcommit() { |
3 > echo "$1" > "$1" |
3 > echo "$1" > "$1" |
4 > hg add "$1" |
4 > hg add "$1" |
5 > hg ci -m "$1" |
5 > message="$1" |
|
6 > shift |
|
7 > hg ci -m "$message" $* |
6 > } |
8 > } |
7 |
9 |
8 $ hg init initialrepo |
10 $ hg init initialrepo |
9 $ cd initialrepo |
11 $ cd initialrepo |
10 $ mkcommit A |
12 $ mkcommit A |
35 $ hglog |
37 $ hglog |
36 3 1 D |
38 3 1 D |
37 2 1 C |
39 2 1 C |
38 1 0 B |
40 1 0 B |
39 0 0 A |
41 0 0 A |
|
42 |
|
43 Test creating changeset as secret |
|
44 |
|
45 $ mkcommit E --config phases.new-commit=2 |
|
46 $ hglog |
|
47 4 2 E |
|
48 3 1 D |
|
49 2 1 C |
|
50 1 0 B |
|
51 0 0 A |
|
52 |
|
53 Test the secret property is inherited |
|
54 |
|
55 $ mkcommit H |
|
56 $ hglog |
|
57 5 2 H |
|
58 4 2 E |
|
59 3 1 D |
|
60 2 1 C |
|
61 1 0 B |
|
62 0 0 A |
|
63 |
|
64 Even on merge |
|
65 |
|
66 $ hg up -q 1 |
|
67 $ mkcommit "B'" |
|
68 created new head |
|
69 $ hglog |
|
70 6 1 B' |
|
71 5 2 H |
|
72 4 2 E |
|
73 3 1 D |
|
74 2 1 C |
|
75 1 0 B |
|
76 0 0 A |
|
77 $ hg merge 4 # E |
|
78 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
79 (branch merge, don't forget to commit) |
|
80 $ hg ci -m "merge B' and E" |
|
81 $ hglog |
|
82 7 2 merge B' and E |
|
83 6 1 B' |
|
84 5 2 H |
|
85 4 2 E |
|
86 3 1 D |
|
87 2 1 C |
|
88 1 0 B |
|
89 0 0 A |
|
90 |