comparison tests/test-evolve.t @ 3914:96945ea908df stable

branching: merge default into stable

The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.

3901:f2b8429db565

  [255]

Shows "use 'hg evolve' to..." hints iff the evolve command is enabled

  $ hg --hidden up 14
  updating to a hidden changeset 484fb3cfa7f2
  (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory parent is obsolete! (484fb3cfa7f2)
  $ cat >> $HGRCPATH <<EOF
  > [experimental]
  > evolutioncommands=evolve
  > EOF
  $ hg --hidden up 15
  updating to a hidden changeset daa1ff1c7fbd
  (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory parent is obsolete! (daa1ff1c7fbd)
  (use 'hg evolve' to update to its successor: 0c049e4e5422)

Restore all of the evolution features

  atop:[37] amended
  move:[36] will cause conflict at evolve
  atop:[38] will be evolved safely
  merging newfile
  warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
  evolve failed!
  fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort
  abort: unresolved merge conflicts (see hg help resolve)
  [255]

  $ glog -r "be23044af550::" --hidden
  @  38:61abd81de026@default(draft) will be evolved safely
  |
  o  37:df89d30f23e2@default(draft) amended

  |
  ~

  $ hg status newlyadded
  A newlyadded

3914:96945ea908df

  [255]

Shows "use 'hg evolve' to..." hints iff the evolve command is enabled

  $ hg --hidden up 14
  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
  updated to hidden changeset 484fb3cfa7f2
  (hidden revision '484fb3cfa7f2' was rewritten as: 98e171e2f272)
  working directory parent is obsolete! (484fb3cfa7f2)
  $ cat >> $HGRCPATH <<EOF
  > [experimental]
  > evolutioncommands=evolve
  > EOF
  $ hg --hidden up 15
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  updated to hidden changeset daa1ff1c7fbd
  (hidden revision 'daa1ff1c7fbd' was rewritten as: 0c049e4e5422)
  working directory parent is obsolete! (daa1ff1c7fbd)
  (use 'hg evolve' to update to its successor: 0c049e4e5422)

Restore all of the evolution features

  atop:[37] amended
  move:[36] will cause conflict at evolve
  atop:[38] will be evolved safely
  merging newfile
  warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
  fix conflicts and see `hg help evolve.interrupted`
  [1]

  $ glog -r "be23044af550::" --hidden
  @  38:61abd81de026@default(draft) will be evolved safely
  |
  o  37:df89d30f23e2@default(draft) amended

  |
  ~

  $ hg status newlyadded
  A newlyadded

  $ cd ..

Testing bookmark movement when `hg evolve` updates to successor (issue5923)

  $ hg init issue5923
  $ cd issue5923
  $ echo foo > a
  $ hg ci -Aqm "added a"

  $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n"
  @  0:f7ad41964313 added a
  
  $ echo bar >> a
  $ hg amend

  $ hg log -GT "{rev}:{node|short} {desc} {bookmarks}\n"
  @  1:ab832e43dd5a added a
  
  $ hg up f7ad41964313 --hidden
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  updated to hidden changeset f7ad41964313
  (hidden revision 'f7ad41964313' was rewritten as: ab832e43dd5a)
  working directory parent is obsolete! (f7ad41964313)
  (use 'hg evolve' to update to its successor: ab832e43dd5a)

  $ hg bookmark book

  $ hg evolve
  update:[1] added a
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  working directory is now at ab832e43dd5a

  $ hg log -GT "{rev}:{node|short} {desc} ({bookmarks})\n" --hidden
  @  1:ab832e43dd5a added a (book)
  
  x  0:f7ad41964313 added a ()