tests/test-evolve-noupdate.t
branchmercurial-4.3
changeset 4228 9a384c7a3b6a
parent 4174 e07e764c0f48
equal deleted inserted replaced
4227:4684e6db4480 4228:9a384c7a3b6a
    42 
    42 
    43   $ hg up .^^
    43   $ hg up .^^
    44   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
    44   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
    45   $ echo bar > b
    45   $ echo bar > b
    46   $ hg amend
    46   $ hg amend
    47   2 new orphan changesets
    47   2 new unstable changesets
    48   $ hg glog
    48   $ hg glog
    49   @  5:7ed0642d644b added b
    49   @  6:7ed0642d644b added b
    50   |   () draft
    50   |   () draft
    51   | o  4:c41c793e0ef1 added d
    51   | o  4:c41c793e0ef1 added d
    52   | |   () draft
    52   | |   () draft
    53   | o  3:ca1b80f7960a added c
    53   | o  3:ca1b80f7960a added c
    54   | |   () draft
    54   | |   () draft
    60       () draft
    60       () draft
    61 
    61 
    62 There is 'working directory is now at' message because it didnt changed
    62 There is 'working directory is now at' message because it didnt changed
    63   $ hg evolve --all --no-update
    63   $ hg evolve --all --no-update
    64   move:[3] added c
    64   move:[3] added c
    65   atop:[5] added b
    65   atop:[6] added b
    66   move:[4] added d
    66   move:[4] added d
    67 
    67 
    68   $ hg glog
    68   $ hg glog
    69   o  7:b6b20b8eefdc added d
    69   o  8:b6b20b8eefdc added d
    70   |   () draft
    70   |   () draft
    71   o  6:7c46f743e62f added c
    71   o  7:7c46f743e62f added c
    72   |   () draft
    72   |   () draft
    73   @  5:7ed0642d644b added b
    73   @  6:7ed0642d644b added b
    74   |   () draft
    74   |   () draft
    75   o  1:c7586e2a9264 added a
    75   o  1:c7586e2a9264 added a
    76   |   () draft
    76   |   () draft
    77   o  0:8fa14d15e168 added hgignore
    77   o  0:8fa14d15e168 added hgignore
    78       () draft
    78       () draft
    83   $ hg prev
    83   $ hg prev
    84   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    84   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
    85   [1] added a
    85   [1] added a
    86   $ echo bar > a
    86   $ echo bar > a
    87   $ hg amend
    87   $ hg amend
    88   3 new orphan changesets
    88   3 new unstable changesets
    89   $ hg up 7ed0642d644b
    89   $ hg up 7ed0642d644b
    90   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
    90   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
    91 
    91 
    92   $ hg glog
    92   $ hg glog
    93   o  8:3d41537b44ca added a
    93   o  10:3d41537b44ca added a
    94   |   () draft
    94   |   () draft
    95   | o  7:b6b20b8eefdc added d
    95   | o  8:b6b20b8eefdc added d
    96   | |   () draft
    96   | |   () draft
    97   | o  6:7c46f743e62f added c
    97   | o  7:7c46f743e62f added c
    98   | |   () draft
    98   | |   () draft
    99   | @  5:7ed0642d644b added b
    99   | @  6:7ed0642d644b added b
   100   | |   () draft
   100   | |   () draft
   101   | x  1:c7586e2a9264 added a
   101   | x  1:c7586e2a9264 added a
   102   |/    () draft
   102   |/    () draft
   103   o  0:8fa14d15e168 added hgignore
   103   o  0:8fa14d15e168 added hgignore
   104       () draft
   104       () draft
   105 
   105 
   106   $ hg evolve --all --any --no-update
   106   $ hg evolve --all --any --no-update
   107   move:[5] added b
   107   move:[6] added b
   108   atop:[8] added a
   108   atop:[10] added a
   109   move:[6] added c
   109   move:[7] added c
   110   move:[7] added d
   110   move:[8] added d
   111   working directory is now at 12c720cb3782
   111   working directory is now at 12c720cb3782
   112 
   112 
   113   $ hg glog
   113   $ hg glog
   114   o  11:a74d9f22ba3f added d
   114   o  13:a74d9f22ba3f added d
   115   |   () draft
   115   |   () draft
   116   o  10:958f5155e8cd added c
   116   o  12:958f5155e8cd added c
   117   |   () draft
   117   |   () draft
   118   @  9:12c720cb3782 added b
   118   @  11:12c720cb3782 added b
   119   |   () draft
   119   |   () draft
   120   o  8:3d41537b44ca added a
   120   o  10:3d41537b44ca added a
   121   |   () draft
   121   |   () draft
   122   o  0:8fa14d15e168 added hgignore
   122   o  0:8fa14d15e168 added hgignore
   123       () draft
   123       () draft