Mercurial Mercurial > pub > hg > evolve / comparison
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-abort-orphan.t
branchmercurial-4.4
changeset 4552 0eb80259f9cb
parent 4548 d3cc1b55ad0a
parent 4363 a2fdbece7ce1
child 4675 79bc0f1a832e
equal deleted inserted replaced
4551:7de160f6c7a9 4552:0eb80259f9cb 
    76   [3] added c
 
    76   [3] added c
 
    77 
    77 
    78   $ echo babar > d
 
    78   $ echo babar > d
 
    79   $ hg add d
 
    79   $ hg add d
 
    80   $ hg amend
 
    80   $ hg amend
 
    81   1 new orphan changesets
 
       
    82 
    81 
    83   $ hg evolve --all
 
    82   $ hg evolve --all
 
    84   move:[4] added d
 
    83   move:[4] added d
 
    85   atop:[5] added c
 
    84   atop:[5] added c
 
    86   merging d
 
    85   merging d
 
   108   working directory is now at e93a9161a274
 
   107   working directory is now at e93a9161a274
 
   109 
   108 
   110   $ hg glog
 
   109   $ hg glog
 
   111   @  5:e93a9161a274 added c
 
   110   @  5:e93a9161a274 added c
 
   112   |   () draft
 
   111   |   () draft
 
   113   | *  4:c41c793e0ef1 added d
 
   112   | o  4:c41c793e0ef1 added d
 
   114   | |   () draft
 
   113   | |   () draft
 
   115   | x  3:ca1b80f7960a added c
 
   114   | x  3:ca1b80f7960a added c
 
   116   |/    () draft
 
   115   |/    () draft
 
   117   o  2:b1661037fa25 added b
 
   116   o  2:b1661037fa25 added b
 
   118   |   () draft
 
   117   |   () draft
 
   149 =======================================================
 
   148 =======================================================
 
   150 
   149 
   151   $ echo bar > c
 
   150   $ echo bar > c
 
   152   $ hg add c
 
   151   $ hg add c
 
   153   $ hg amend
 
   152   $ hg amend
 
   154   3 new orphan changesets
 
       
   155 
   153 
   156   $ hg evolve --all
 
   154   $ hg evolve --all
 
   157   move:[2] added b
 
   155   move:[2] added b
 
   158   atop:[7] added a
 
   156   atop:[7] added a
 
   159   move:[5] added c
 
   157   move:[5] added c
 
   183   $ hg glog
 
   181   $ hg glog
 
   184   @  8:0c41ec482070 added b
 
   182   @  8:0c41ec482070 added b
 
   185   |   () draft
 
   183   |   () draft
 
   186   o  7:125af0ed8cae added a
 
   184   o  7:125af0ed8cae added a
 
   187   |   () draft
 
   185   |   () draft
 
   188   | *  6:e83de241f751 added d
 
   186   | o  6:e83de241f751 added d
 
   189   | |   () draft
 
   187   | |   () draft
 
   190   | @  5:e93a9161a274 added c
 
   188   | @  5:e93a9161a274 added c
 
   191   | |   () draft
 
   189   | |   () draft
 
   192   | x  2:b1661037fa25 added b
 
   190   | x  2:b1661037fa25 added b
 
   193   | |   () draft
 
   191   | |   () draft
 
   195   |/    () draft
 
   193   |/    () draft
 
   196   o  0:8fa14d15e168 added hgignore
 
   194   o  0:8fa14d15e168 added hgignore
 
   197       () draft
 
   195       () draft
 
   198 
   196 
   199   $ hg evolve --abort
 
   197   $ hg evolve --abort
 
   200   1 new orphan changesets
 
       
   201   evolve aborted
 
   198   evolve aborted
 
   202   working directory is now at 125af0ed8cae
 
   199   working directory is now at 125af0ed8cae
 
   203 
   200 
   204   $ hg glog
 
   201   $ hg glog
 
   205   @  7:125af0ed8cae added a
 
   202   @  7:125af0ed8cae added a
 
   206   |   () draft
 
   203   |   () draft
 
   207   | *  6:e83de241f751 added d
 
   204   | o  6:e83de241f751 added d
 
   208   | |   () draft
 
   205   | |   () draft
 
   209   | *  5:e93a9161a274 added c
 
   206   | o  5:e93a9161a274 added c
 
   210   | |   () draft
 
   207   | |   () draft
 
   211   | *  2:b1661037fa25 added b
 
   208   | o  2:b1661037fa25 added b
 
   212   | |   () draft
 
   209   | |   () draft
 
   213   | x  1:c7586e2a9264 added a
 
   210   | x  1:c7586e2a9264 added a
 
   214   |/    () draft
 
   211   |/    () draft
 
   215   o  0:8fa14d15e168 added hgignore
 
   212   o  0:8fa14d15e168 added hgignore
 
   216       () draft
 
   213       () draft
 
   257   $ hg prev
 
   254   $ hg prev
 
   258   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   255   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   259   [1] added a
 
   256   [1] added a
 
   260   $ echo aa > a
 
   257   $ echo aa > a
 
   261   $ hg amend
 
   258   $ hg amend
 
   262   5 new orphan changesets
 
       
   263 
   259 
   264   $ hg evolve --all
 
   260   $ hg evolve --all
 
   265   move:[2] added b
 
   261   move:[2] added b
 
   266   atop:[7] added a
 
   262   atop:[7] added a
 
   267   move:[4] added c
 
   263   move:[4] added c
 
   280   |/    () draft
 
   276   |/    () draft
 
   281   @  7:807e8e2ca559 added a
 
   277   @  7:807e8e2ca559 added a
 
   282   |   () draft
 
   278   |   () draft
 
   283   | @  6:8f20d4390c21 foo to a
 
   279   | @  6:8f20d4390c21 foo to a
 
   284   | |   () draft
 
   280   | |   () draft
 
   285   | | *  5:bcb1c47f8520 added d
 
   281   | | o  5:bcb1c47f8520 added d
 
   286   | | |   () draft
 
   282   | | |   () draft
 
   287   | | x  4:86d2603075a3 added c
 
   283   | | x  4:86d2603075a3 added c
 
   288   | |/    () draft
 
   284   | |/    () draft
 
   289   | | *  3:17509928e5bf added c
 
   285   | | o  3:17509928e5bf added c
 
   290   | | |   () draft
 
   286   | | |   () draft
 
   291   | | x  2:9f0c80a55ddc added b
 
   287   | | x  2:9f0c80a55ddc added b
 
   292   | |/    () draft
 
   288   | |/    () draft
 
   293   | x  1:2f913b0c9220 added a
 
   289   | x  1:2f913b0c9220 added a
 
   294   |/    () draft
 
   290   |/    () draft
 
   295   o  0:8fa14d15e168 added hgignore
 
   291   o  0:8fa14d15e168 added hgignore
 
   296       () draft
 
   292       () draft
 
   297 
   293 
   298   $ hg evolve --abort
 
   294   $ hg evolve --abort
 
   299   2 new orphan changesets
 
       
   300   evolve aborted
 
   295   evolve aborted
 
   301   working directory is now at 807e8e2ca559
 
   296   working directory is now at 807e8e2ca559
 
   302 
   297 
   303   $ hg glog
 
   298   $ hg glog
 
   304   @  7:807e8e2ca559 added a
 
   299   @  7:807e8e2ca559 added a
 
   305   |   () draft
 
   300   |   () draft
 
   306   | *  6:8f20d4390c21 foo to a
 
   301   | o  6:8f20d4390c21 foo to a
 
   307   | |   () draft
 
   302   | |   () draft
 
   308   | | *  5:bcb1c47f8520 added d
 
   303   | | o  5:bcb1c47f8520 added d
 
   309   | | |   () draft
 
   304   | | |   () draft
 
   310   | | *  4:86d2603075a3 added c
 
   305   | | o  4:86d2603075a3 added c
 
   311   | |/    () draft
 
   306   | |/    () draft
 
   312   | | *  3:17509928e5bf added c
 
   307   | | o  3:17509928e5bf added c
 
   313   | | |   () draft
 
   308   | | |   () draft
 
   314   | | *  2:9f0c80a55ddc added b
 
   309   | | o  2:9f0c80a55ddc added b
 
   315   | |/    () draft
 
   310   | |/    () draft
 
   316   | x  1:2f913b0c9220 added a
 
   311   | x  1:2f913b0c9220 added a
 
   317   |/    () draft
 
   312   |/    () draft
 
   318   o  0:8fa14d15e168 added hgignore
 
   313   o  0:8fa14d15e168 added hgignore
 
   319       () draft
 
   314       () draft
 
   343   |/    () draft
 
   338   |/    () draft
 
   344   @  7:807e8e2ca559 added a
 
   339   @  7:807e8e2ca559 added a
 
   345   |   () draft
 
   340   |   () draft
 
   346   | @  6:8f20d4390c21 foo to a
 
   341   | @  6:8f20d4390c21 foo to a
 
   347   | |   () draft
 
   342   | |   () draft
 
   348   | | *  5:bcb1c47f8520 added d
 
   343   | | o  5:bcb1c47f8520 added d
 
   349   | | |   () draft
 
   344   | | |   () draft
 
   350   | | x  4:86d2603075a3 added c
 
   345   | | x  4:86d2603075a3 added c
 
   351   | |/    () draft
 
   346   | |/    () draft
 
   352   | | *  3:17509928e5bf added c
 
   347   | | o  3:17509928e5bf added c
 
   353   | | |   () draft
 
   348   | | |   () draft
 
   354   | | x  2:9f0c80a55ddc added b
 
   349   | | x  2:9f0c80a55ddc added b
 
   355   | |/    () draft
 
   350   | |/    () draft
 
   356   | x  1:2f913b0c9220 added a
 
   351   | x  1:2f913b0c9220 added a
 
   357   |/    () draft
 
   352   |/    () draft
 
   372   adding changesets
 
   367   adding changesets
 
   373   adding manifests
 
   368   adding manifests
 
   374   adding file changes
 
   369   adding file changes
 
   375   added 10 changesets with 8 changes to 5 files (+4 heads)
 
   370   added 10 changesets with 8 changes to 5 files (+4 heads)
 
   376   3 new obsolescence markers
 
   371   3 new obsolescence markers
 
   377   3 new orphan changesets
 
       
   378   $ cd ../clonerepo
 
   372   $ cd ../clonerepo
 
   379   $ hg up 7f8e8bd9f0b6
 
   373   $ hg up 7f8e8bd9f0b6
 
   380   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   374   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   381   $ echo bar > bar
 
   375   $ echo bar > bar
 
   382   $ hg add bar
 
   376   $ hg add bar
 
   464   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   458   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
   465   (leaving bookmark bm1)
 
   459   (leaving bookmark bm1)
 
   466   $ echo foo > c
 
   460   $ echo foo > c
 
   467   $ hg add c
 
   461   $ hg add c
 
   468   $ hg amend
 
   462   $ hg amend
 
   469   2 new orphan changesets
 
       
   470 
   463 
   471   $ hg glog
 
   464   $ hg glog
 
   472   @  4:a0086c17bfc7 added a
 
   465   @  4:a0086c17bfc7 added a
 
   473   |   () draft
 
   466   |   () draft
 
   474   | *  3:17509928e5bf added c
 
   467   | o  3:17509928e5bf added c
 
   475   | |   () draft
 
   468   | |   () draft
 
   476   | *  2:9f0c80a55ddc added b
 
   469   | o  2:9f0c80a55ddc added b
 
   477   | |   (bm1) draft
 
   470   | |   (bm1) draft
 
   478   | x  1:2f913b0c9220 added a
 
   471   | x  1:2f913b0c9220 added a
 
   479   |/    () draft
 
   472   |/    () draft
 
   480   o  0:8fa14d15e168 added hgignore
 
   473   o  0:8fa14d15e168 added hgignore
 
   481       () draft
 
   474       () draft
 
   502   |/    () draft
 
   495   |/    () draft
 
   503   o  0:8fa14d15e168 added hgignore
 
   496   o  0:8fa14d15e168 added hgignore
 
   504       () draft
 
   497       () draft
 
   505 
   498 
   506   $ hg evolve --abort
 
   499   $ hg evolve --abort
 
   507   1 new orphan changesets
 
       
   508   evolve aborted
 
   500   evolve aborted
 
   509   working directory is now at a0086c17bfc7
 
   501   working directory is now at a0086c17bfc7
 
   510 
   502 
   511   $ hg glog
 
   503   $ hg glog
 
   512   @  4:a0086c17bfc7 added a
 
   504   @  4:a0086c17bfc7 added a
 
   513   |   () draft
 
   505   |   () draft
 
   514   | *  3:17509928e5bf added c
 
   506   | o  3:17509928e5bf added c
 
   515   | |   () draft
 
   507   | |   () draft
 
   516   | *  2:9f0c80a55ddc added b
 
   508   | o  2:9f0c80a55ddc added b
 
   517   | |   (bm1) draft
 
   509   | |   (bm1) draft
 
   518   | x  1:2f913b0c9220 added a
 
   510   | x  1:2f913b0c9220 added a
 
   519   |/    () draft
 
   511   |/    () draft
 
   520   o  0:8fa14d15e168 added hgignore
 
   512   o  0:8fa14d15e168 added hgignore
 
   521       () draft
 
   513       () draft
evolve