103 |
103 |
104 adding base |
104 adding base |
105 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
105 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
106 adding b1 |
106 adding b1 |
107 % log -f |
107 % log -f |
108 changeset: 3:e62f78d544b4 |
108 changeset: 3:07a62f044f0d |
109 tag: tip |
109 branch: dummy |
110 parent: 1:3d5bf5654eda |
110 tag: tip |
111 user: test |
111 parent: 1:fb3d4e35b279 |
112 date: Thu Jan 01 00:00:01 1970 +0000 |
112 user: test |
113 summary: b1 |
113 date: Thu Jan 01 00:00:01 1970 +0000 |
114 |
114 summary: b1 |
115 changeset: 1:3d5bf5654eda |
115 |
|
116 changeset: 1:fb3d4e35b279 |
|
117 branch: dummy |
116 user: test |
118 user: test |
117 date: Thu Jan 01 00:00:01 1970 +0000 |
119 date: Thu Jan 01 00:00:01 1970 +0000 |
118 summary: r1 |
120 summary: r1 |
119 |
121 |
120 changeset: 0:67e992f2c4f3 |
122 changeset: 0:ea445bfed6b9 |
|
123 branch: dummy |
121 user: test |
124 user: test |
122 date: Thu Jan 01 00:00:01 1970 +0000 |
125 date: Thu Jan 01 00:00:01 1970 +0000 |
123 summary: base |
126 summary: base |
124 |
127 |
125 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
128 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
126 adding b2 |
129 adding b2 |
127 % log -f -r 1:tip |
130 % log -f -r 1:tip |
128 changeset: 1:3d5bf5654eda |
131 changeset: 1:fb3d4e35b279 |
|
132 branch: dummy |
129 user: test |
133 user: test |
130 date: Thu Jan 01 00:00:01 1970 +0000 |
134 date: Thu Jan 01 00:00:01 1970 +0000 |
131 summary: r1 |
135 summary: r1 |
132 |
136 |
133 changeset: 2:60c670bf5b30 |
137 changeset: 2:e8882cbc828c |
|
138 branch: dummy |
134 user: test |
139 user: test |
135 date: Thu Jan 01 00:00:01 1970 +0000 |
140 date: Thu Jan 01 00:00:01 1970 +0000 |
136 summary: r2 |
141 summary: r2 |
137 |
142 |
138 changeset: 3:e62f78d544b4 |
143 changeset: 3:07a62f044f0d |
139 parent: 1:3d5bf5654eda |
144 branch: dummy |
|
145 parent: 1:fb3d4e35b279 |
140 user: test |
146 user: test |
141 date: Thu Jan 01 00:00:01 1970 +0000 |
147 date: Thu Jan 01 00:00:01 1970 +0000 |
142 summary: b1 |
148 summary: b1 |
143 |
149 |
144 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
150 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
145 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
146 (branch merge, don't forget to commit) |
152 (branch merge, don't forget to commit) |
147 % log --follow-first |
153 % log --follow-first |
148 changeset: 6:2404bbcab562 |
154 changeset: 6:0f621dafa603 |
|
155 branch: dummy |
149 tag: tip |
156 tag: tip |
150 user: test |
157 user: test |
151 date: Thu Jan 01 00:00:01 1970 +0000 |
158 date: Thu Jan 01 00:00:01 1970 +0000 |
152 summary: b1.1 |
159 summary: b1.1 |
153 |
160 |
154 changeset: 5:302e9dd6890d |
161 changeset: 5:0cf53fb6dfd5 |
155 parent: 3:e62f78d544b4 |
162 branch: dummy |
156 parent: 4:ddb82e70d1a1 |
163 parent: 3:07a62f044f0d |
|
164 parent: 4:b76598590bc3 |
157 user: test |
165 user: test |
158 date: Thu Jan 01 00:00:01 1970 +0000 |
166 date: Thu Jan 01 00:00:01 1970 +0000 |
159 summary: m12 |
167 summary: m12 |
160 |
168 |
161 changeset: 3:e62f78d544b4 |
169 changeset: 3:07a62f044f0d |
162 parent: 1:3d5bf5654eda |
170 branch: dummy |
163 user: test |
171 parent: 1:fb3d4e35b279 |
164 date: Thu Jan 01 00:00:01 1970 +0000 |
172 user: test |
165 summary: b1 |
173 date: Thu Jan 01 00:00:01 1970 +0000 |
166 |
174 summary: b1 |
167 changeset: 1:3d5bf5654eda |
175 |
|
176 changeset: 1:fb3d4e35b279 |
|
177 branch: dummy |
168 user: test |
178 user: test |
169 date: Thu Jan 01 00:00:01 1970 +0000 |
179 date: Thu Jan 01 00:00:01 1970 +0000 |
170 summary: r1 |
180 summary: r1 |
171 |
181 |
172 changeset: 0:67e992f2c4f3 |
182 changeset: 0:ea445bfed6b9 |
|
183 branch: dummy |
173 user: test |
184 user: test |
174 date: Thu Jan 01 00:00:01 1970 +0000 |
185 date: Thu Jan 01 00:00:01 1970 +0000 |
175 summary: base |
186 summary: base |
176 |
187 |
177 % log -P 2 |
188 % log -P 2 |
178 changeset: 6:2404bbcab562 |
189 changeset: 6:0f621dafa603 |
|
190 branch: dummy |
179 tag: tip |
191 tag: tip |
180 user: test |
192 user: test |
181 date: Thu Jan 01 00:00:01 1970 +0000 |
193 date: Thu Jan 01 00:00:01 1970 +0000 |
182 summary: b1.1 |
194 summary: b1.1 |
183 |
195 |
184 changeset: 5:302e9dd6890d |
196 changeset: 5:0cf53fb6dfd5 |
185 parent: 3:e62f78d544b4 |
197 branch: dummy |
186 parent: 4:ddb82e70d1a1 |
198 parent: 3:07a62f044f0d |
|
199 parent: 4:b76598590bc3 |
187 user: test |
200 user: test |
188 date: Thu Jan 01 00:00:01 1970 +0000 |
201 date: Thu Jan 01 00:00:01 1970 +0000 |
189 summary: m12 |
202 summary: m12 |
190 |
203 |
191 changeset: 4:ddb82e70d1a1 |
204 changeset: 4:b76598590bc3 |
192 parent: 0:67e992f2c4f3 |
205 branch: dummy |
|
206 parent: 0:ea445bfed6b9 |
193 user: test |
207 user: test |
194 date: Thu Jan 01 00:00:01 1970 +0000 |
208 date: Thu Jan 01 00:00:01 1970 +0000 |
195 summary: b2 |
209 summary: b2 |
196 |
210 |
197 changeset: 3:e62f78d544b4 |
211 changeset: 3:07a62f044f0d |
198 parent: 1:3d5bf5654eda |
212 branch: dummy |
|
213 parent: 1:fb3d4e35b279 |
199 user: test |
214 user: test |
200 date: Thu Jan 01 00:00:01 1970 +0000 |
215 date: Thu Jan 01 00:00:01 1970 +0000 |
201 summary: b1 |
216 summary: b1 |
202 |
217 |
203 % log -r "" |
218 % log -r "" |