comparison tests/test-evolve.t @ 1797:4de90774eade mercurial-3.7

merge with 5.6.0

Not extra change were needed from the mercurial-3.8 branch

1796:2be05515b142

  $ hg graft -O 7
  grafting 7:a5bfd90a2f29 "conflict" (tip)
  merging 1
  warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
  abort: unresolved conflicts, can't continue
  (use 'hg resolve' and 'hg graft --continue')
  [255]
  $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
  7:a5bfd90a2f29 
  $ echo 3 > 1
  $ hg resolve -m 1

  | |
  o |  19:24e63b319adf@default(draft) add gg
  |/
  o  18:edc3c9de504e@default(draft) a3
  |
  ~

  $ hg evolve --rev 23 --any
  abort: cannot specify both "--rev" and "--any"
  [255]
  $ hg evolve --rev 23

  | |
  o |  19:24e63b319adf@default(draft) add gg
  |/
  o  18:edc3c9de504e@default(draft) a3
  |
  ~

Check that prune respects the allowunstable option
  $ hg up -C .
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg up 20

  | |
  o |  19:24e63b319adf@default(draft) add gg
  |/
  o  18:edc3c9de504e@default(draft) a3
  |
  ~
  $ hg up 19
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ mkcommit c5_
  created new head
  $ hg prune '26 + 27'

  | |
  o |  19:24e63b319adf@default(draft) add gg
  |/
  o  18:edc3c9de504e@default(draft) a3
  |
  ~

Check that fold respects the allowunstable option
  $ hg up edc3c9de504e
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ mkcommit unstableifparentisfolded

  | |
  | o  19:24e63b319adf@default(draft) add gg
  |/
  o  18:edc3c9de504e@default(draft) a3
  |
  ~

  $ hg fold --exact "19 + 18"
  abort: cannot fold chain not ending with a head or with branching
  (new unstable changesets are not allowed)
  [255]

  |/
  | o  20:e02107f98737@default(draft) add gh
  |/
  o  18:edc3c9de504e@default(draft) a3
  |
  ~

Create a split commit
  $ printf "oo" > oo;
  $ printf "pp" > pp;
  $ hg add oo pp

  |/
  | o  20:e02107f98737@default(draft) add gh
  |/
  o  18:edc3c9de504e@default(draft) a3
  |
  ~
  $ hg evolve --rev "18::"
  move:[33] add uu
  atop:[35] _pp
  working directory is now at 43c3f5ef149f

  | |/
  | x  37:36030b147271@default(draft) will be amended
  |/
  o  36:43c3f5ef149f@default(draft) add uu
  |
  ~

  $ hg status newlyadded
  A newlyadded

hg metaedit

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ glog -r .
  @  44:41bf1183869c@default(draft) amended
  |
  ~

no new commit is created here because the date is the same
  $ HGEDITOR=cat hg metaedit
  amended
  

  $ glog -r '.^::.'
  @  44:41bf1183869c@default(draft) amended
  |
  o  36:43c3f5ef149f@default(draft) add uu
  |
  ~

TODO: don't create a new commit in this case
  $ hg metaedit --config defaults.metaedit=
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n'

1797:4de90774eade

  $ hg graft -O 7
  grafting 7:a5bfd90a2f29 "conflict" (tip)
  merging 1
  warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
  abort: unresolved conflicts, can't continue
  (use hg resolve and hg graft --continue)
  [255]
  $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n'
  7:a5bfd90a2f29 
  $ echo 3 > 1
  $ hg resolve -m 1

  | |
  o |  19:24e63b319adf@default(draft) add gg
  |/
  o  18:edc3c9de504e@default(draft) a3
  |

  $ hg evolve --rev 23 --any
  abort: cannot specify both "--rev" and "--any"
  [255]
  $ hg evolve --rev 23

  | |
  o |  19:24e63b319adf@default(draft) add gg
  |/
  o  18:edc3c9de504e@default(draft) a3
  |

Check that prune respects the allowunstable option
  $ hg up -C .
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg up 20

  | |
  o |  19:24e63b319adf@default(draft) add gg
  |/
  o  18:edc3c9de504e@default(draft) a3
  |
  $ hg up 19
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ mkcommit c5_
  created new head
  $ hg prune '26 + 27'

  | |
  o |  19:24e63b319adf@default(draft) add gg
  |/
  o  18:edc3c9de504e@default(draft) a3
  |

Check that fold respects the allowunstable option
  $ hg up edc3c9de504e
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ mkcommit unstableifparentisfolded

  | |
  | o  19:24e63b319adf@default(draft) add gg
  |/
  o  18:edc3c9de504e@default(draft) a3
  |

  $ hg fold --exact "19 + 18"
  abort: cannot fold chain not ending with a head or with branching
  (new unstable changesets are not allowed)
  [255]

  |/
  | o  20:e02107f98737@default(draft) add gh
  |/
  o  18:edc3c9de504e@default(draft) a3
  |

Create a split commit
  $ printf "oo" > oo;
  $ printf "pp" > pp;
  $ hg add oo pp

  |/
  | o  20:e02107f98737@default(draft) add gh
  |/
  o  18:edc3c9de504e@default(draft) a3
  |
  $ hg evolve --rev "18::"
  move:[33] add uu
  atop:[35] _pp
  working directory is now at 43c3f5ef149f

  | |/
  | x  37:36030b147271@default(draft) will be amended
  |/
  o  36:43c3f5ef149f@default(draft) add uu
  |

  $ hg status newlyadded
  A newlyadded

hg metaedit

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ glog -r .
  @  44:41bf1183869c@default(draft) amended
  |

no new commit is created here because the date is the same
  $ HGEDITOR=cat hg metaedit
  amended
  

  $ glog -r '.^::.'
  @  44:41bf1183869c@default(draft) amended
  |
  o  36:43c3f5ef149f@default(draft) add uu
  |

TODO: don't create a new commit in this case
  $ hg metaedit --config defaults.metaedit=
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg log -r '.^::.' --template '{rev}: {desc|firstline}\n'