tests/test-evolve-obshistory-content-divergent.t
branchmercurial-4.5
changeset 3924 f3713d41b85b
parent 3909 f7afd3a158e3
child 3930 d00f0c369bc7
equal deleted inserted replaced
3923:257481642686 3924:f3713d41b85b
   331           "rev": 2,
   331           "rev": 2,
   332           "shortdescription": "A1"
   332           "shortdescription": "A1"
   333       }
   333       }
   334   ]
   334   ]
   335   $ hg update 471f378eab4c
   335   $ hg update 471f378eab4c
   336   abort: hidden revision '471f378eab4c' has diverged!
   336   abort: hidden revision '471f378eab4c'!
   337   (use --hidden to access hidden revisions)
   337   (use --hidden to access hidden revisions; diverged)
   338   [255]
   338   [255]
   339   $ hg update --hidden 'desc(A0)'
   339   $ hg update --hidden 'desc(A0)'
   340   updating to a hidden changeset 471f378eab4c
   340   updating to a hidden changeset 471f378eab4c
   341   (hidden revision '471f378eab4c' has diverged)
   341   (hidden revision '471f378eab4c' has diverged)
   342   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   342   0 files updated, 0 files merged, 0 files removed, 0 files unresolved