371 |/ |
371 |/ |
372 o 6 feature-A: a nifty feature - test |
372 o 6 feature-A: a nifty feature - test |
373 | |
373 | |
374 o 0 : base - test |
374 o 0 : base - test |
375 |
375 |
|
376 $ hg status --change 8 |
|
377 M main-file-1 |
|
378 A file-from-B |
|
379 $ hg export 8 |
|
380 # HG changeset patch |
|
381 # User test |
|
382 # Date 0 0 |
|
383 # Thu Jan 01 00:00:00 1970 +0000 |
|
384 # Node ID 47d52a103155ab078ff5bf486bc0c738bcb2a1b6 |
|
385 # Parent ba0ec09b1babf3489b567853807f452edd46704f |
|
386 another feature that rox |
|
387 |
|
388 diff --git a/file-from-B b/file-from-B |
|
389 new file mode 100644 |
|
390 --- /dev/null |
|
391 +++ b/file-from-B |
|
392 @@ -0,0 +1,1 @@ |
|
393 +Two |
|
394 diff --git a/main-file-1 b/main-file-1 |
|
395 --- a/main-file-1 |
|
396 +++ b/main-file-1 |
|
397 @@ -3,1 +3,1 @@ |
|
398 -Two |
|
399 +deux |
376 $ hg evolve --any --traceback --bumped |
400 $ hg evolve --any --traceback --bumped |
377 recreate:[8] another feature that rox |
401 recreate:[8] another feature that rox |
378 atop:[7] another feature (child of ba0ec09b1bab) |
402 atop:[7] another feature (child of ba0ec09b1bab) |
379 computing new diff |
403 computing new diff |
380 committed as 2d8c5414e9f0 |
404 committed as 2d8c5414e9f0 |
381 working directory is now at 2d8c5414e9f0 |
405 working directory is now at 2d8c5414e9f0 |
|
406 $ hg status --change . |
|
407 M main-file-1 |
|
408 $ hg export . |
|
409 # HG changeset patch |
|
410 # User test |
|
411 # Date 0 0 |
|
412 # Thu Jan 01 00:00:00 1970 +0000 |
|
413 # Node ID 2d8c5414e9f0cabf0286a53ec526ab7cda76468c |
|
414 # Parent 99833d22b0c6526806fe26fe79b61ad51a72458d |
|
415 bumped update to 99833d22b0c6: |
|
416 |
|
417 another feature that rox |
|
418 |
|
419 diff --git a/main-file-1 b/main-file-1 |
|
420 --- a/main-file-1 |
|
421 +++ b/main-file-1 |
|
422 @@ -3,1 +3,1 @@ |
|
423 -Zwei |
|
424 +deux |
|
425 $ hg log --debug --rev . --config ui.logtemplate= |
|
426 changeset: 9:2d8c5414e9f0cabf0286a53ec526ab7cda76468c |
|
427 bookmark: feature-B |
|
428 tag: tip |
|
429 phase: draft |
|
430 parent: 7:99833d22b0c6526806fe26fe79b61ad51a72458d |
|
431 parent: -1:0000000000000000000000000000000000000000 |
|
432 manifest: 9:9dee7532189f6d1b2eadb9cad8f3407a3ed02162 |
|
433 user: test |
|
434 date: Thu Jan 01 00:00:00 1970 +0000 |
|
435 files: main-file-1 |
|
436 extra: branch=default |
|
437 description: |
|
438 bumped update to 99833d22b0c6: |
|
439 |
|
440 another feature that rox |
|
441 |
|
442 |
|
443 $ hg manifest --debug -r . |
|
444 669c54abb32b6f06b395c85feca4511e433ad00b 644 file-from-A |
|
445 94f2f82a0c3f341ead55ea8d2b130f972ed56666 644 file-from-B |
|
446 006a74077e75026fda3ebe59f330125443f13e8c 644 main-file-1 |
|
447 94f2f82a0c3f341ead55ea8d2b130f972ed56666 644 main-file-2 |
|
448 $ hg debugindex -m --debug |
|
449 rev offset length delta linkrev nodeid p1 p2 |
|
450 0 0 88 -1 0 7ec8c19bea7d58a3435e518951d344f145f00f21 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 |
|
451 1 88 102 0 1 e6d587806c552637b4810e90f1a4492be513f511 7ec8c19bea7d58a3435e518951d344f145f00f21 0000000000000000000000000000000000000000 |
|
452 2 190 101 1 2 5cba0742aaff351051f964e91ed485c3e89b6d8a e6d587806c552637b4810e90f1a4492be513f511 0000000000000000000000000000000000000000 |
|
453 3 291 65 2 3 a819820fd6d4a8cc14831b6953852a22232dc748 5cba0742aaff351051f964e91ed485c3e89b6d8a 0000000000000000000000000000000000000000 |
|
454 4 356 101 1 4 ce0cdb18d6b1536f8a602a6267f05f2359327da5 e6d587806c552637b4810e90f1a4492be513f511 0000000000000000000000000000000000000000 |
|
455 5 457 65 1 5 344560ba9ee91e6187cf4b4310c357c8c63a501a e6d587806c552637b4810e90f1a4492be513f511 0000000000000000000000000000000000000000 |
|
456 6 522 101 0 6 e656c939e387427a6b077ef798ccebd237d03ef5 7ec8c19bea7d58a3435e518951d344f145f00f21 0000000000000000000000000000000000000000 |
|
457 7 623 103 6 7 bf464c9d2093ac0524289f031f6c2e906041afb5 e656c939e387427a6b077ef798ccebd237d03ef5 0000000000000000000000000000000000000000 |
|
458 8 726 102 6 8 1da1c04471dbf03a362b0fdfeacb18989e6ec370 e656c939e387427a6b077ef798ccebd237d03ef5 0000000000000000000000000000000000000000 |
|
459 9 828 129 -1 9 9dee7532189f6d1b2eadb9cad8f3407a3ed02162 bf464c9d2093ac0524289f031f6c2e906041afb5 0000000000000000000000000000000000000000 |
|
460 $ hg cat -r . main-file-1 |
|
461 Un |
|
462 |
|
463 deux |
|
464 |
|
465 Three |
|
466 $ hg debugindex main-file-1 |
|
467 rev offset length delta linkrev nodeid p1 p2 |
|
468 0 0 17 -1 0 492807de722e 000000000000 000000000000 |
|
469 1 17 17 0 1 629043b63e18 492807de722e 000000000000 |
|
470 2 34 19 -1 2 fe90ca8e68c3 629043b63e18 000000000000 |
|
471 3 53 17 2 3 da9c20556aaf fe90ca8e68c3 000000000000 |
|
472 4 70 0 3 4 800800a0f2b5 629043b63e18 000000000000 |
|
473 5 70 16 -1 5 3aa0e5d0fa17 629043b63e18 000000000000 |
|
474 6 86 0 5 6 d6ada519b989 492807de722e 000000000000 |
|
475 7 86 17 -1 7 8d64e54db1c4 d6ada519b989 000000000000 |
|
476 8 103 17 -1 8 ba9aab3c7032 d6ada519b989 000000000000 |
|
477 9 120 0 8 9 006a74077e75 000000000000 000000000000 |
382 $ hg glog |
478 $ hg glog |
383 @ 9 feature-B: bumped update to 99833d22b0c6: - test |
479 @ 9 feature-B: bumped update to 99833d22b0c6: - test |
384 | |
480 | |
385 o 7 : another feature (child of ba0ec09b1bab) - test |
481 o 7 : another feature (child of ba0ec09b1bab) - test |
386 | |
482 | |