equal
deleted
inserted
replaced
201 $ hg up feature-A -q |
201 $ hg up feature-A -q |
202 $ hg bookmark -i feature-A |
202 $ hg bookmark -i feature-A |
203 $ sed -i'' -e s/Eins/Un/ main-file-1 |
203 $ sed -i'' -e s/Eins/Un/ main-file-1 |
204 |
204 |
205 $ hg amend --note 'french looks better' |
205 $ hg amend --note 'french looks better' |
|
206 1 new unstables changesets |
206 $ hg log |
207 $ hg log |
207 6 feature-A: a nifty feature - test |
208 6 feature-A: a nifty feature - test |
208 4 feature-B: another feature - test |
209 4 feature-B: another feature - test |
209 1 : a nifty feature - test |
210 1 : a nifty feature - test |
210 0 : base - test |
211 0 : base - test |
244 created new head |
245 created new head |
245 $ hg log |
246 $ hg log |
246 8 feature-B: another feature that rox - test |
247 8 feature-B: another feature that rox - test |
247 6 feature-A: a nifty feature - test |
248 6 feature-A: a nifty feature - test |
248 0 : base - test |
249 0 : base - test |
|
250 $ cd .. |
|
251 |
|
252 enable general delta |
|
253 |
|
254 $ cat << EOF >> $HGRCPATH |
|
255 > [format] |
|
256 > generaldelta=1 |
|
257 > EOF |
|
258 |
|
259 |
|
260 |
|
261 $ hg init alpha |
|
262 $ cd alpha |
|
263 $ echo 'base' > firstfile |
|
264 $ hg add firstfile |
|
265 $ hg ci -m 'base' |
|
266 |
|
267 $ cd .. |
|
268 $ hg clone -Ur 0 alpha beta |
|
269 adding changesets |
|
270 adding manifests |
|
271 adding file changes |
|
272 added 1 changesets with 1 changes to 1 files |
|
273 $ cd alpha |
|
274 |
|
275 $ cat << EOF > A |
|
276 > We |
|
277 > need |
|
278 > some |
|
279 > kind |
|
280 > of |
|
281 > file |
|
282 > big |
|
283 > enough |
|
284 > to |
|
285 > prevent |
|
286 > snapshot |
|
287 > . |
|
288 > yes |
|
289 > new |
|
290 > lines |
|
291 > are |
|
292 > useless |
|
293 > . |
|
294 > EOF |
|
295 $ hg add A |
|
296 $ hg commit -m 'adding A' |
|
297 $ hg mv A B |
|
298 $ echo '.' >> B |
|
299 $ hg amend -m 'add B' |
|
300 $ cd .. |
|
301 |
|
302 Clone just this branch |
|
303 |
|
304 $ cd beta |
|
305 $ hg pull -r tip ../alpha |
|
306 pulling from ../alpha |
|
307 searching for changes |
|
308 adding changesets |
|
309 adding manifests |
|
310 adding file changes |
|
311 added 1 changesets with 1 changes to 1 files |
|
312 (run 'hg update' to get a working copy) |
|
313 $ hg up |
|
314 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |