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 4553 aafd51f145ea
parent 4516 f54bb6eaf5e6
child 4675 79bc0f1a832e
equal deleted inserted replaced
4552:0eb80259f9cb 4553:aafd51f145ea 
   258   $ cd ../stackrepo1
 
   258   $ cd ../stackrepo1
 
   259   $ hg up .^^^
 
   259   $ hg up .^^^
 
   260   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
   260   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
 
   261   $ echo wat > a
 
   261   $ echo wat > a
 
   262   $ hg amend -m "watbar to a"
 
   262   $ hg amend -m "watbar to a"
 
   263   3 new orphan changesets
 
       
   264   $ hg evolve --all
 
   263   $ hg evolve --all
 
   265   move:[2] added b
 
   264   move:[2] added b
 
   266   atop:[5] watbar to a
 
   265   atop:[5] watbar to a
 
   267   move:[3] added c
 
   266   move:[3] added c
 
   268   move:[4] added d
 
   267   move:[4] added d
 
   286   adding changesets
 
   285   adding changesets
 
   287   adding manifests
 
   286   adding manifests
 
   288   adding file changes
 
   287   adding file changes
 
   289   added 5 changesets with 1 changes to 5 files (+1 heads)
 
   288   added 5 changesets with 1 changes to 5 files (+1 heads)
 
   290   4 new obsolescence markers
 
   289   4 new obsolescence markers
 
   291   8 new content-divergent changesets
 
       
   292   new changesets 2228e3b74514:d45f050514c2
 
   290   new changesets 2228e3b74514:d45f050514c2
 
   293   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   291   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   294 
   292 
   295   $ hg glog
 
   293   $ hg glog
 
   296   *  13:d45f050514c2 added d
 
   294   o  13:d45f050514c2 added d
 
   297   |   () [default] draft
 
   295   |   () [default] draft
 
   298   *  12:8ed612937375 added c
 
   296   o  12:8ed612937375 added c
 
   299   |   () [default] draft
 
   297   |   () [default] draft
 
   300   *  11:6eb54b5af3fb added b
 
   298   o  11:6eb54b5af3fb added b
 
   301   |   () [default] draft
 
   299   |   () [default] draft
 
   302   *  10:c04ff147ef79 added a
 
   300   o  10:c04ff147ef79 added a
 
   303   |   () [default] draft
 
   301   |   () [default] draft
 
   304   o  9:2228e3b74514 add newfile
 
   302   o  9:2228e3b74514 add newfile
 
   305   |   () [default] draft
 
   303   |   () [default] draft
 
   306   | @  8:c72d2885eb51 added d
 
   304   | @  8:c72d2885eb51 added d
 
   307   | |   () [default] draft
 
   305   | |   () [default] draft
 
   308   | *  7:3ce4be6d8e5e added c
 
   306   | o  7:3ce4be6d8e5e added c
 
   309   | |   () [default] draft
 
   307   | |   () [default] draft
 
   310   | *  6:d5f148423c16 added b
 
   308   | o  6:d5f148423c16 added b
 
   311   | |   () [default] draft
 
   309   | |   () [default] draft
 
   312   | *  5:8e222f257bbf watbar to a
 
   310   | o  5:8e222f257bbf watbar to a
 
   313   |/    () [default] draft
 
   311   |/    () [default] draft
 
   314   o  0:8fa14d15e168 added hgignore
 
   312   o  0:8fa14d15e168 added hgignore
 
   315       () [default] draft
 
   313       () [default] draft
 
   316 
   314 
   317   $ hg evolve --all --content-divergent
 
   315   $ hg evolve --all --content-divergent
 
   320   base: [1] added a
 
   318   base: [1] added a
 
   321   rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
 
   319   rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
 
   322   updating to "local" side of the conflict: c04ff147ef79
 
   320   updating to "local" side of the conflict: c04ff147ef79
 
   323   merging "other" content-divergent changeset '186bdc2cdfa2'
 
   321   merging "other" content-divergent changeset '186bdc2cdfa2'
 
   324   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   322   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   325   6 new orphan changesets
 
       
   326   merge:[11] added b
 
   323   merge:[11] added b
 
   327   with: [6] added b
 
   324   with: [6] added b
 
   328   base: [2] added b
 
   325   base: [2] added b
 
   329   rebasing "other" content-divergent changeset d5f148423c16 on c04ff147ef79
 
   326   rebasing "other" content-divergent changeset d5f148423c16 on c04ff147ef79
 
   330   updating to "local" side of the conflict: 6eb54b5af3fb
 
   327   updating to "local" side of the conflict: 6eb54b5af3fb
evolve