Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-evolve.t
changeset 1731 7a76f9a43e89
parent 1710 aec233d3cafd
child 1732 f4047fba5e90 
--- a/tests/test-evolve.t	Thu Sep 01 07:40:27 2016 +0530
+++ b/tests/test-evolve.t	Wed Sep 07 17:51:15 2016 +0200
@@ -373,12 +373,108 @@
   |
   o  0	: base - test
   
+  $ hg status --change 8
+  M main-file-1
+  A file-from-B
+  $ hg export 8
+  # HG changeset patch
+  # User test
+  # Date 0 0
+  #      Thu Jan 01 00:00:00 1970 +0000
+  # Node ID 47d52a103155ab078ff5bf486bc0c738bcb2a1b6
+  # Parent  ba0ec09b1babf3489b567853807f452edd46704f
+  another feature that rox
+  
+  diff --git a/file-from-B b/file-from-B
+  new file mode 100644
+  --- /dev/null
+  +++ b/file-from-B
+  @@ -0,0 +1,1 @@
+  +Two
+  diff --git a/main-file-1 b/main-file-1
+  --- a/main-file-1
+  +++ b/main-file-1
+  @@ -3,1 +3,1 @@
+  -Two
+  +deux
   $ hg evolve --any --traceback --bumped
   recreate:[8] another feature that rox
   atop:[7] another feature (child of ba0ec09b1bab)
   computing new diff
   committed as 2d8c5414e9f0
   working directory is now at 2d8c5414e9f0
+  $ hg status --change .
+  M main-file-1
+  $ hg export .
+  # HG changeset patch
+  # User test
+  # Date 0 0
+  #      Thu Jan 01 00:00:00 1970 +0000
+  # Node ID 2d8c5414e9f0cabf0286a53ec526ab7cda76468c
+  # Parent  99833d22b0c6526806fe26fe79b61ad51a72458d
+  bumped update to 99833d22b0c6:
+  
+  another feature that rox
+  
+  diff --git a/main-file-1 b/main-file-1
+  --- a/main-file-1
+  +++ b/main-file-1
+  @@ -3,1 +3,1 @@
+  -Zwei
+  +deux
+  $ hg log --debug --rev . --config ui.logtemplate=
+  changeset:   9:2d8c5414e9f0cabf0286a53ec526ab7cda76468c
+  bookmark:    feature-B
+  tag:         tip
+  phase:       draft
+  parent:      7:99833d22b0c6526806fe26fe79b61ad51a72458d
+  parent:      -1:0000000000000000000000000000000000000000
+  manifest:    9:9dee7532189f6d1b2eadb9cad8f3407a3ed02162
+  user:        test
+  date:        Thu Jan 01 00:00:00 1970 +0000
+  files:       main-file-1
+  extra:       branch=default
+  description:
+  bumped update to 99833d22b0c6:
+  
+  another feature that rox
+  
+  
+  $ hg manifest --debug -r .
+  669c54abb32b6f06b395c85feca4511e433ad00b 644   file-from-A
+  94f2f82a0c3f341ead55ea8d2b130f972ed56666 644   file-from-B
+  006a74077e75026fda3ebe59f330125443f13e8c 644   main-file-1
+  94f2f82a0c3f341ead55ea8d2b130f972ed56666 644   main-file-2
+  $ hg debugindex -m --debug
+     rev    offset  length  delta linkrev nodeid                                   p1                                       p2
+       0         0      88     -1       0 7ec8c19bea7d58a3435e518951d344f145f00f21 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
+       1        88     102      0       1 e6d587806c552637b4810e90f1a4492be513f511 7ec8c19bea7d58a3435e518951d344f145f00f21 0000000000000000000000000000000000000000
+       2       190     101      1       2 5cba0742aaff351051f964e91ed485c3e89b6d8a e6d587806c552637b4810e90f1a4492be513f511 0000000000000000000000000000000000000000
+       3       291      65      2       3 a819820fd6d4a8cc14831b6953852a22232dc748 5cba0742aaff351051f964e91ed485c3e89b6d8a 0000000000000000000000000000000000000000
+       4       356     101      1       4 ce0cdb18d6b1536f8a602a6267f05f2359327da5 e6d587806c552637b4810e90f1a4492be513f511 0000000000000000000000000000000000000000
+       5       457      65      1       5 344560ba9ee91e6187cf4b4310c357c8c63a501a e6d587806c552637b4810e90f1a4492be513f511 0000000000000000000000000000000000000000
+       6       522     101      0       6 e656c939e387427a6b077ef798ccebd237d03ef5 7ec8c19bea7d58a3435e518951d344f145f00f21 0000000000000000000000000000000000000000
+       7       623     103      6       7 bf464c9d2093ac0524289f031f6c2e906041afb5 e656c939e387427a6b077ef798ccebd237d03ef5 0000000000000000000000000000000000000000
+       8       726     102      6       8 1da1c04471dbf03a362b0fdfeacb18989e6ec370 e656c939e387427a6b077ef798ccebd237d03ef5 0000000000000000000000000000000000000000
+       9       828     129     -1       9 9dee7532189f6d1b2eadb9cad8f3407a3ed02162 bf464c9d2093ac0524289f031f6c2e906041afb5 0000000000000000000000000000000000000000
+  $ hg cat -r . main-file-1
+  Un
+  
+  deux
+  
+  Three
+  $ hg debugindex main-file-1
+     rev    offset  length  delta linkrev nodeid       p1           p2
+       0         0      17     -1       0 492807de722e 000000000000 000000000000
+       1        17      17      0       1 629043b63e18 492807de722e 000000000000
+       2        34      19     -1       2 fe90ca8e68c3 629043b63e18 000000000000
+       3        53      17      2       3 da9c20556aaf fe90ca8e68c3 000000000000
+       4        70       0      3       4 800800a0f2b5 629043b63e18 000000000000
+       5        70      16     -1       5 3aa0e5d0fa17 629043b63e18 000000000000
+       6        86       0      5       6 d6ada519b989 492807de722e 000000000000
+       7        86      17     -1       7 8d64e54db1c4 d6ada519b989 000000000000
+       8       103      17     -1       8 ba9aab3c7032 d6ada519b989 000000000000
+       9       120       0      8       9 006a74077e75 000000000000 000000000000
   $ hg glog
   @  9	feature-B: bumped update to 99833d22b0c6: - test
   |
evolve