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-sharing.t
branchstable
changeset 3160 f42a87cc864d
parent 3154 406992d0d611
child 3166 e1a230cc4527
child 3359 ae6fddf39933
equal deleted inserted replaced
3137:c3953ae44b87 3160:f42a87cc864d 
   503   $ hg --hidden shortlog -r 'successors(2fe6)'
 
   503   $ hg --hidden shortlog -r 'successors(2fe6)'
 
   504   5:a360947f6faf  draft  fix bug 24 (v2 by bob)
 
   504   5:a360947f6faf  draft  fix bug 24 (v2 by bob)
 
   505   6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
 
   505   6:e3f99ce9d9cd  draft  fix bug 24 (v2 by alice)
 
   506 
   506 
   507 Use evolve to fix the divergence.
 
   507 Use evolve to fix the divergence.
 
   508   $ HGMERGE=internal:other hg evolve --contentdivergent
 
   508   $ HGMERGE=internal:other hg evolve --content-divergent
 
   509   merge:[5] fix bug 24 (v2 by bob)
 
   509   merge:[5] fix bug 24 (v2 by bob)
 
   510   with: [6] fix bug 24 (v2 by alice)
 
   510   with: [6] fix bug 24 (v2 by alice)
 
   511   base: [4] fix bug 24 (v1)
 
   511   base: [4] fix bug 24 (v1)
 
   512   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
   512   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
   513   working directory is now at 5ad6037c046c
 
   513   working directory is now at 5ad6037c046c
evolve