tests/test-evolve-stop-orphan.t
branchmercurial-4.4
changeset 4363 a2fdbece7ce1
parent 4356 a71f2271ed76
parent 4173 e268f7fd7839
child 4675 79bc0f1a832e
equal deleted inserted replaced
4362:8bd60e09dfb4 4363:a2fdbece7ce1
    68   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    68   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    69   [3] added c
    69   [3] added c
    70   $ echo bar > d
    70   $ echo bar > d
    71   $ hg add d
    71   $ hg add d
    72   $ hg amend
    72   $ hg amend
    73   1 new orphan changesets
       
    74   $ hg glog
    73   $ hg glog
    75   @  5:cb6a2ab625bb added c
    74   @  5:cb6a2ab625bb added c
    76   |   () draft
    75   |   () draft
    77   | *  4:c41c793e0ef1 added d
    76   | o  4:c41c793e0ef1 added d
    78   | |   () draft
    77   | |   () draft
    79   | x  3:ca1b80f7960a added c
    78   | x  3:ca1b80f7960a added c
    80   |/    () draft
    79   |/    () draft
    81   o  2:b1661037fa25 added b
    80   o  2:b1661037fa25 added b
    82   |   () draft
    81   |   () draft
   114 
   113 
   115 Checking graph
   114 Checking graph
   116   $ hg glog
   115   $ hg glog
   117   @  5:cb6a2ab625bb added c
   116   @  5:cb6a2ab625bb added c
   118   |   () draft
   117   |   () draft
   119   | *  4:c41c793e0ef1 added d
   118   | o  4:c41c793e0ef1 added d
   120   | |   () draft
   119   | |   () draft
   121   | x  3:ca1b80f7960a added c
   120   | x  3:ca1b80f7960a added c
   122   |/    () draft
   121   |/    () draft
   123   o  2:b1661037fa25 added b
   122   o  2:b1661037fa25 added b
   124   |   () draft
   123   |   () draft
   154   working directory is now at cb6a2ab625bb
   153   working directory is now at cb6a2ab625bb
   155 
   154 
   156   $ hg glog
   155   $ hg glog
   157   @  5:cb6a2ab625bb added c
   156   @  5:cb6a2ab625bb added c
   158   |   () draft
   157   |   () draft
   159   | *  4:c41c793e0ef1 added d
   158   | o  4:c41c793e0ef1 added d
   160   | |   () draft
   159   | |   () draft
   161   | x  3:ca1b80f7960a added c
   160   | x  3:ca1b80f7960a added c
   162   |/    () draft
   161   |/    () draft
   163   o  2:b1661037fa25 added b
   162   o  2:b1661037fa25 added b
   164   |   () draft
   163   |   () draft
   219   $ hg up .^^^^
   218   $ hg up .^^^^
   220   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   219   0 files updated, 0 files merged, 4 files removed, 0 files unresolved
   221   $ echo bar > c
   220   $ echo bar > c
   222   $ hg add c
   221   $ hg add c
   223   $ hg amend
   222   $ hg amend
   224   4 new orphan changesets
       
   225 
   223 
   226   $ hg glog
   224   $ hg glog
   227   @  7:21817cd42526 added hgignore
   225   @  7:21817cd42526 added hgignore
   228       () draft
   226       () draft
   229   *  6:2a4e03d422e2 added d
   227   o  6:2a4e03d422e2 added d
   230   |   () draft
   228   |   () draft
   231   *  5:cb6a2ab625bb added c
   229   o  5:cb6a2ab625bb added c
   232   |   () draft
   230   |   () draft
   233   *  2:b1661037fa25 added b
   231   o  2:b1661037fa25 added b
   234   |   () draft
   232   |   () draft
   235   *  1:c7586e2a9264 added a
   233   o  1:c7586e2a9264 added a
   236   |   () draft
   234   |   () draft
   237   x  0:8fa14d15e168 added hgignore
   235   x  0:8fa14d15e168 added hgignore
   238       () draft
   236       () draft
   239 
   237 
   240   $ hg evolve --all
   238   $ hg evolve --all
   261   |   () draft
   259   |   () draft
   262   o  8:fd00db71edca added a
   260   o  8:fd00db71edca added a
   263   |   () draft
   261   |   () draft
   264   o  7:21817cd42526 added hgignore
   262   o  7:21817cd42526 added hgignore
   265       () draft
   263       () draft
   266   *  6:2a4e03d422e2 added d
   264   o  6:2a4e03d422e2 added d
   267   |   () draft
   265   |   () draft
   268   *  5:cb6a2ab625bb added c
   266   o  5:cb6a2ab625bb added c
   269   |   () draft
   267   |   () draft
   270   x  2:b1661037fa25 added b
   268   x  2:b1661037fa25 added b
   271   |   () draft
   269   |   () draft
   272   x  1:c7586e2a9264 added a
   270   x  1:c7586e2a9264 added a
   273   |   () draft
   271   |   () draft
   332   $ hg prev
   330   $ hg prev
   333   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   331   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   334   [8] added a
   332   [8] added a
   335   $ echo tom > c
   333   $ echo tom > c
   336   $ hg amend
   334   $ hg amend
   337   3 new orphan changesets
       
   338 
   335 
   339   $ hg glog
   336   $ hg glog
   340   @  12:a3cc2042492f added a
   337   @  12:a3cc2042492f added a
   341   |   () draft
   338   |   () draft
   342   | *  11:cd0909a30222 added d
   339   | o  11:cd0909a30222 added d
   343   | |   () draft
   340   | |   () draft
   344   | *  10:cb1dd1086ef6 added c
   341   | o  10:cb1dd1086ef6 added c
   345   | |   (b1) draft
   342   | |   (b1) draft
   346   | *  9:aec285328e90 added b
   343   | o  9:aec285328e90 added b
   347   | |   (b2) draft
   344   | |   (b2) draft
   348   | x  8:fd00db71edca added a
   345   | x  8:fd00db71edca added a
   349   |/    () draft
   346   |/    () draft
   350   o  7:21817cd42526 added hgignore
   347   o  7:21817cd42526 added hgignore
   351       () draft
   348       () draft
   367   $ hg glog
   364   $ hg glog
   368   @  13:a3f4b95da934 added b
   365   @  13:a3f4b95da934 added b
   369   |   (b2) draft
   366   |   (b2) draft
   370   o  12:a3cc2042492f added a
   367   o  12:a3cc2042492f added a
   371   |   () draft
   368   |   () draft
   372   | *  11:cd0909a30222 added d
   369   | o  11:cd0909a30222 added d
   373   | |   () draft
   370   | |   () draft
   374   | *  10:cb1dd1086ef6 added c
   371   | o  10:cb1dd1086ef6 added c
   375   | |   (b1) draft
   372   | |   (b1) draft
   376   | x  9:aec285328e90 added b
   373   | x  9:aec285328e90 added b
   377   | |   () draft
   374   | |   () draft
   378   | x  8:fd00db71edca added a
   375   | x  8:fd00db71edca added a
   379   |/    () draft
   376   |/    () draft