tests/test-evolve-obshistory-phase-divergent.t
branchmercurial-4.6
changeset 5091 308c1e09f80f
parent 3909 f7afd3a158e3
child 3924 f3713d41b85b
child 5163 1752a2e7a226
equal deleted inserted replaced
5090:2631e735ec16 5091:308c1e09f80f
    35      user:        test
    35      user:        test
    36      date:        Thu Jan 01 00:00:00 1970 +0000
    36      date:        Thu Jan 01 00:00:00 1970 +0000
    37      summary:     ROOT
    37      summary:     ROOT
    38   
    38   
    39   $ hg update --hidden 'desc(A0)'
    39   $ hg update --hidden 'desc(A0)'
       
    40   updating to a hidden changeset 471f378eab4c
       
    41   (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
    40   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    42   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
    41   updated to hidden changeset 471f378eab4c
       
    42   (hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
       
    43   working directory parent is obsolete! (471f378eab4c)
    43   working directory parent is obsolete! (471f378eab4c)
    44   (use 'hg evolve' to update to its successor: fdf9bde5129a)
    44   (use 'hg evolve' to update to its successor: fdf9bde5129a)
    45   $ hg phase -p .
    45   $ hg phase -p .
    46   1 new phase-divergent changesets
    46   1 new phase-divergent changesets
    47   $ hg log --hidden -G
    47   $ hg log --hidden -G