Show More
@@ -28,3 +28,38 b' echo % one rename' | |||||
28 | hg log -vf a |
|
28 | hg log -vf a | |
29 | echo % many renames |
|
29 | echo % many renames | |
30 | hg log -vf e |
|
30 | hg log -vf e | |
|
31 | ||||
|
32 | # log --follow tests | |||
|
33 | hg init ../follow | |||
|
34 | cd ../follow | |||
|
35 | echo base > base | |||
|
36 | hg ci -Ambase -d '1 0' | |||
|
37 | ||||
|
38 | echo r1 >> base | |||
|
39 | hg ci -Amr1 -d '1 0' | |||
|
40 | echo r2 >> base | |||
|
41 | hg ci -Amr2 -d '1 0' | |||
|
42 | ||||
|
43 | hg up -C 1 | |||
|
44 | echo b1 > b1 | |||
|
45 | hg ci -Amb1 -d '1 0' | |||
|
46 | ||||
|
47 | echo % log -f | |||
|
48 | hg log -f | |||
|
49 | ||||
|
50 | hg up -C 0 | |||
|
51 | echo b2 > b2 | |||
|
52 | hg ci -Amb2 -d '1 0' | |||
|
53 | ||||
|
54 | echo % log -f -r 1:tip | |||
|
55 | hg log -f -r 1:tip | |||
|
56 | ||||
|
57 | hg up -C 3 | |||
|
58 | hg merge tip | |||
|
59 | hg ci -mm12 -d '1 0' | |||
|
60 | ||||
|
61 | echo postm >> b1 | |||
|
62 | hg ci -Amb1.1 -d'1 0' | |||
|
63 | ||||
|
64 | echo % log --follow-first | |||
|
65 | hg log --follow-first |
@@ -76,3 +76,76 b' description:' | |||||
76 | a |
|
76 | a | |
77 |
|
77 | |||
78 |
|
78 | |||
|
79 | adding base | |||
|
80 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
81 | adding b1 | |||
|
82 | % log -f | |||
|
83 | changeset: 3:e62f78d544b4 | |||
|
84 | tag: tip | |||
|
85 | parent: 1:3d5bf5654eda | |||
|
86 | user: test | |||
|
87 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
88 | summary: b1 | |||
|
89 | ||||
|
90 | changeset: 1:3d5bf5654eda | |||
|
91 | user: test | |||
|
92 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
93 | summary: r1 | |||
|
94 | ||||
|
95 | changeset: 0:67e992f2c4f3 | |||
|
96 | user: test | |||
|
97 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
98 | summary: base | |||
|
99 | ||||
|
100 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
101 | adding b2 | |||
|
102 | % log -f -r 1:tip | |||
|
103 | changeset: 1:3d5bf5654eda | |||
|
104 | user: test | |||
|
105 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
106 | summary: r1 | |||
|
107 | ||||
|
108 | changeset: 2:60c670bf5b30 | |||
|
109 | user: test | |||
|
110 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
111 | summary: r2 | |||
|
112 | ||||
|
113 | changeset: 3:e62f78d544b4 | |||
|
114 | parent: 1:3d5bf5654eda | |||
|
115 | user: test | |||
|
116 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
117 | summary: b1 | |||
|
118 | ||||
|
119 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
120 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
121 | (branch merge, don't forget to commit) | |||
|
122 | % log --follow-first | |||
|
123 | changeset: 6:2404bbcab562 | |||
|
124 | tag: tip | |||
|
125 | user: test | |||
|
126 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
127 | summary: b1.1 | |||
|
128 | ||||
|
129 | changeset: 5:302e9dd6890d | |||
|
130 | parent: 3:e62f78d544b4 | |||
|
131 | parent: 4:ddb82e70d1a1 | |||
|
132 | user: test | |||
|
133 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
134 | summary: m12 | |||
|
135 | ||||
|
136 | changeset: 3:e62f78d544b4 | |||
|
137 | parent: 1:3d5bf5654eda | |||
|
138 | user: test | |||
|
139 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
140 | summary: b1 | |||
|
141 | ||||
|
142 | changeset: 1:3d5bf5654eda | |||
|
143 | user: test | |||
|
144 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
145 | summary: r1 | |||
|
146 | ||||
|
147 | changeset: 0:67e992f2c4f3 | |||
|
148 | user: test | |||
|
149 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
150 | summary: base | |||
|
151 |
General Comments 0
You need to be logged in to leave comments.
Login now