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-content-divergent-stack.t
branchmercurial-4.4
changeset 4675 79bc0f1a832e
parent 4553 aafd51f145ea
parent 4672 653c42af172e
equal deleted inserted replaced
4674:3810ca63398f 4675:79bc0f1a832e 
    62 
    62 
    63   $ hg up c7586e2a9264
 
    63   $ hg up c7586e2a9264
 
    64   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    64   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
    65   $ echo bar > a
 
    65   $ echo bar > a
 
    66   $ hg amend -m "watbar to a"
 
    66   $ hg amend -m "watbar to a"
 
    67   3 new orphan changesets
 
       
    68   $ echo wat > a
 
    67   $ echo wat > a
 
    69   $ hg amend -m "watbar to a"
 
    68   $ hg amend -m "watbar to a"
 
    70   $ hg evolve --all
 
    69   $ hg evolve --all
 
    71   move:[2] added b
 
    70   move:[2] added b
 
    72   atop:[6] watbar to a
 
    71   atop:[6] watbar to a
 
    87   $ cd ../stacktest
 
    86   $ cd ../stacktest
 
    88   $ hg up .^^^
 
    87   $ hg up .^^^
 
    89   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
    88   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
    90   $ echo wat > a
 
    89   $ echo wat > a
 
    91   $ hg amend -m "watbar to a"
 
    90   $ hg amend -m "watbar to a"
 
    92   3 new orphan changesets
 
       
    93   $ hg evolve --all
 
    91   $ hg evolve --all
 
    94   move:[2] added b
 
    92   move:[2] added b
 
    95   atop:[5] watbar to a
 
    93   atop:[5] watbar to a
 
    96   move:[3] added c
 
    94   move:[3] added c
 
    97   move:[4] added d
 
    95   move:[4] added d
 
   113   adding changesets
 
   111   adding changesets
 
   114   adding manifests
 
   112   adding manifests
 
   115   adding file changes
 
   113   adding file changes
 
   116   added 4 changesets with 0 changes to 4 files (+1 heads)
 
   114   added 4 changesets with 0 changes to 4 files (+1 heads)
 
   117   5 new obsolescence markers
 
   115   5 new obsolescence markers
 
   118   8 new content-divergent changesets
 
       
   119   new changesets 82b74d5dc678:15c781f93cac
 
   116   new changesets 82b74d5dc678:15c781f93cac
 
   120   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   117   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   121 
   118 
   122   $ hg glog
 
   119   $ hg glog
 
   123   *  12:15c781f93cac added d
 
   120   o  12:15c781f93cac added d
 
   124   |   () [default] draft
 
   121   |   () [default] draft
 
   125   *  11:9e5fb1d5b955 added c
 
   122   o  11:9e5fb1d5b955 added c
 
   126   |   () [default] draft
 
   123   |   () [default] draft
 
   127   *  10:88516dccf68a added b
 
   124   o  10:88516dccf68a added b
 
   128   |   () [default] draft
 
   125   |   () [default] draft
 
   129   *  9:82b74d5dc678 watbar to a
 
   126   o  9:82b74d5dc678 watbar to a
 
   130   |   () [default] draft
 
   127   |   () [default] draft
 
   131   | *  8:c72d2885eb51 added d
 
   128   | *  8:c72d2885eb51 added d
 
   132   | |   () [default] draft
 
   129   | |   () [default] draft
 
   133   | *  7:3ce4be6d8e5e added c
 
   130   | o  7:3ce4be6d8e5e added c
 
   134   | |   () [default] draft
 
   131   | |   () [default] draft
 
   135   | *  6:d5f148423c16 added b
 
   132   | o  6:d5f148423c16 added b
 
   136   | |   () [default] draft
 
   133   | |   () [default] draft
 
   137   | @  5:8e222f257bbf watbar to a
 
   134   | o  5:8e222f257bbf watbar to a
 
   138   |/    () [default] draft
 
   135   |/    () [default] draft
 
   139   o  0:8fa14d15e168 added hgignore
 
   136   o  0:8fa14d15e168 added hgignore
 
   140       () [default] draft
 
   137       () [default] draft
 
   141 
   138 
   142   $ hg evolve --all --content-divergent
 
   139   $ hg evolve --all --content-divergent
 
   251   $ cd ../stackrepo1
 
   248   $ cd ../stackrepo1
 
   252   $ hg up .^^^
 
   249   $ hg up .^^^
 
   253   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
   250   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
   254   $ echo wat > a
 
   251   $ echo wat > a
 
   255   $ hg amend -m "watbar to a"
 
   252   $ hg amend -m "watbar to a"
 
   256   3 new orphan changesets
 
       
   257   $ hg evolve --all
 
   253   $ hg evolve --all
 
   258   move:[2] added b
 
   254   move:[2] added b
 
   259   atop:[5] watbar to a
 
   255   atop:[5] watbar to a
 
   260   move:[3] added c
 
   256   move:[3] added c
 
   261   move:[4] added d
 
   257   move:[4] added d
 
   278   adding changesets
 
   274   adding changesets
 
   279   adding manifests
 
   275   adding manifests
 
   280   adding file changes
 
   276   adding file changes
 
   281   added 5 changesets with 1 changes to 5 files (+1 heads)
 
   277   added 5 changesets with 1 changes to 5 files (+1 heads)
 
   282   4 new obsolescence markers
 
   278   4 new obsolescence markers
 
   283   8 new content-divergent changesets
 
       
   284   new changesets 2228e3b74514:d45f050514c2
 
   279   new changesets 2228e3b74514:d45f050514c2
 
   285   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   280   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   286 
   281 
   287   $ hg glog
 
   282   $ hg glog
 
   288   *  13:d45f050514c2 added d
 
   283   o  13:d45f050514c2 added d
 
   289   |   () [default] draft
 
   284   |   () [default] draft
 
   290   *  12:8ed612937375 added c
 
   285   o  12:8ed612937375 added c
 
   291   |   () [default] draft
 
   286   |   () [default] draft
 
   292   *  11:6eb54b5af3fb added b
 
   287   o  11:6eb54b5af3fb added b
 
   293   |   () [default] draft
 
   288   |   () [default] draft
 
   294   *  10:c04ff147ef79 added a
 
   289   o  10:c04ff147ef79 added a
 
   295   |   () [default] draft
 
   290   |   () [default] draft
 
   296   o  9:2228e3b74514 add newfile
 
   291   o  9:2228e3b74514 add newfile
 
   297   |   () [default] draft
 
   292   |   () [default] draft
 
   298   | *  8:c72d2885eb51 added d
 
   293   | *  8:c72d2885eb51 added d
 
   299   | |   () [default] draft
 
   294   | |   () [default] draft
 
   300   | *  7:3ce4be6d8e5e added c
 
   295   | o  7:3ce4be6d8e5e added c
 
   301   | |   () [default] draft
 
   296   | |   () [default] draft
 
   302   | *  6:d5f148423c16 added b
 
   297   | o  6:d5f148423c16 added b
 
   303   | |   () [default] draft
 
   298   | |   () [default] draft
 
   304   | @  5:8e222f257bbf watbar to a
 
   299   | o  5:8e222f257bbf watbar to a
 
   305   |/    () [default] draft
 
   300   |/    () [default] draft
 
   306   o  0:8fa14d15e168 added hgignore
 
   301   o  0:8fa14d15e168 added hgignore
 
   307       () [default] draft
 
   302       () [default] draft
 
   308 
   303 
   309   $ hg evolve --all --content-divergent
 
   304   $ hg evolve --all --content-divergent
evolve