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-public-content-divergent-corner-cases.t
branchmercurial-4.6
changeset 5091 308c1e09f80f
parent 4784 ecf0f3bc7468
child 5163 1752a2e7a226
equal deleted inserted replaced
5090:2631e735ec16 5091:308c1e09f80f 
    68       draft
 
    68       draft
 
    69   
    69   
    70 
    70 
    71 On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull:
 
    71 On user side: user has not pulled yet and amended the rev 2 which created the divergence after pull:
 
    72   $ hg up 2 --hidden -q
 
    72   $ hg up 2 --hidden -q
 
    73   updated to hidden changeset 155349b645be
 
    73   updating to a hidden changeset 155349b645be
 
    74   (hidden revision '155349b645be' was rewritten as: c0d7ee6604ea)
 
    74   (hidden revision '155349b645be' was rewritten as: c0d7ee6604ea)
 
    75   working directory parent is obsolete! (155349b645be)
 
    75   working directory parent is obsolete! (155349b645be)
 
    76 
    76 
    77   $ echo cc >> c
 
    77   $ echo cc >> c
 
    78   $ hg ci --amend -m "updated c"
 
    78   $ hg ci --amend -m "updated c"
evolve