comparison tests/test-grab.t @ 4077:9c025ec4af88 mercurial-4.3

test-compat: merge mercurial-4.4 into mercurial-4.3

4033:b609412b42b0

  > }

  $ hg init repo
  $ cd repo
  $ hg help grab
  hg grab [-r] rev
  
  grabs a commit, move it on the top of working directory parent and
      updates to it.
  
  options:
  
   -r --rev VALUE revision to grab
   -c --continue  continue interrupted grab
   -a --abort     abort interrupted grab
  
  (some details hidden, use --verbose to show complete help)

  $ mkcommit a
  $ mkcommit b

  o  0:1f0dee641bb7 add a
  

Grabbing an ancestor

  $ hg grab -r 7c3bad9141dc
  abort: cannot grab an ancestor revision
  [255]

Grabbing the working directory parent

  $ hg grab -r .
  abort: cannot grab an ancestor revision
  [255]

Specifying multiple revisions to grab

  $ hg grab 1f0dee641bb7 -r 7c3bad9141dc
  abort: specify just one revision
  [255]

Specifying no revisions to grab

  $ hg grab
  abort: empty revision set
  [255]

Continuing without interrupted grab

  $ hg grab --continue
  abort: no interrupted grab state exists
  [255]

Aborting without interrupted grab

  $ hg grab --abort
  abort: no interrupted grab state exists
  [255]

Specifying both continue and revs

  $ hg up 1f0dee641bb7
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ hg grab -r 4538525df7e2 --continue
  abort: cannot specify both --continue and revision
  [255]

Making new branch heads

  |/
  o  0:1f0dee641bb7 add a
  
Grabbing a revision

  $ hg grab 7c3bad9141dc
  grabbing 1:7c3bad9141dc "add b"
  $ hg glog
  @  5:7c15c05db6fa add b
  |
  o  4:d46dc301d92f add y
  |

  | |
  | x  1:7c3bad9141dc add b
  |/
  o  0:1f0dee641bb7 add a
  
  $ hg grab -r 4538525df7e2
  grabbing 2:4538525df7e2 "add c"
  note: grab of 2:4538525df7e2 created no changes to commit

  $ hg glog
  @  6:c4636a81ebeb add c
  |
  o  5:7c15c05db6fa add b

  $ hg up d46dc301d92f
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ echo foo > c
  $ hg ci -Aqm "foo to c"
  $ hg grab -r c4636a81ebeb
  grabbing 6:c4636a81ebeb "add c"
  merging c
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts (see hg help resolve)
  [1]

  $ echo foobar > c
  $ hg resolve --all --mark
  (no more unresolved files)
  continue: hg grab --continue
  $ hg grab --continue
  $ hg glog
  @  8:44e155eb95c7 add c
  |
  o  7:2ccc03d1d096 foo to c
  |

  created new head

  $ hg up 44e155eb95c7
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg grab 4e04628911f6
  grabbing 9:4e04628911f6 "foo to c"
  merging c
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts (see hg help resolve)
  [1]
  $ echo foobar > c
  $ hg resolve -m
  (no more unresolved files)
  continue: hg grab --continue

  $ hg grab --continue
  note: grab of 9:4e04628911f6 created no changes to commit

Testing the abort functionality of hg grab

  $ echo foo > b
  $ hg ci -Aqm "foo to b"
  $ hg glog -r .^::
  hg: parse error at 4: not a prefix: end
  [255]

  $ hg grab -r 7c15c05db6fa
  grabbing 5:7c15c05db6fa "add b"
  merging b
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts (see hg help resolve)
  [1]

  $ hg grab --abort
  aborting grab, updating to c437988de89f

  $ hg glog
  @  10:c437988de89f foo to b
  |
  o  8:44e155eb95c7 add c

Trying to grab a public changeset

  $ hg phase -r 7c15c05db6fa -p

  $ hg grab -r 7c15c05db6fa
  abort: cannot grab public changesets: 7c15c05db6fa
  (see 'hg help phases' for details)
  [255]

  $ hg glog
  @  10:c437988de89f foo to b

In case of merge conflicts

  $ hg phase -r 7c15c05db6fa -s -f

  $ hg grab -r 7c15c05db6fa
  grabbing 5:7c15c05db6fa "add b"
  merging b
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts (see hg help resolve)
  [1]

  $ echo bar > b
  $ hg resolve -m
  (no more unresolved files)
  continue: hg grab --continue

  $ hg grab --continue
  $ hg phase -r .
  11: secret

No merge conflicts

  o  0:1f0dee641bb7 add a
  
  $ hg up 10427de9e26e
  3 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg grab -r 508d572e7053
  grabbing 12:508d572e7053 "added l"

  $ hg phase -r .
  13: secret

4077:9c025ec4af88

  > }

  $ hg init repo
  $ cd repo
  $ hg help grab
  hg pick [-r] rev
  
  aliases: grab
  
  grabs a commit, move it on the top of working directory parent and
      updates to it.
  
  options:
  
   -r --rev VALUE revision to pick
   -c --continue  continue interrupted pick
   -a --abort     abort interrupted pick
  
  (some details hidden, use --verbose to show complete help)

  $ mkcommit a
  $ mkcommit b

  o  0:1f0dee641bb7 add a
  

Grabbing an ancestor

  $ hg pick -r 7c3bad9141dc
  abort: cannot pick an ancestor revision
  [255]

Grabbing the working directory parent

  $ hg pick -r .
  abort: cannot pick an ancestor revision
  [255]

Specifying multiple revisions to grab

  $ hg pick 1f0dee641bb7 -r 7c3bad9141dc
  abort: specify just one revision
  [255]

Specifying no revisions to grab

  $ hg pick
  abort: empty revision set
  [255]

Continuing without interrupted grab

  $ hg pick --continue
  abort: no interrupted pick state exists
  [255]

Aborting without interrupted grab

  $ hg pick --abort
  abort: no interrupted pick state exists
  [255]

Specifying both continue and revs

  $ hg up 1f0dee641bb7
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ hg pick -r 4538525df7e2 --continue
  abort: cannot specify both --continue and revision
  [255]

Making new branch heads

  |/
  o  0:1f0dee641bb7 add a
  
Grabbing a revision

  $ hg pick 7c3bad9141dc
  picking 1:7c3bad9141dc "add b"
  $ hg glog
  @  5:7c15c05db6fa add b
  |
  o  4:d46dc301d92f add y
  |

  | |
  | x  1:7c3bad9141dc add b
  |/
  o  0:1f0dee641bb7 add a
  
  $ hg pick -r 4538525df7e2
  picking 2:4538525df7e2 "add c"
  note: picking 2:4538525df7e2 created no changes to commit

  $ hg glog
  @  6:c4636a81ebeb add c
  |
  o  5:7c15c05db6fa add b

  $ hg up d46dc301d92f
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
  $ echo foo > c
  $ hg ci -Aqm "foo to c"
  $ hg pick -r c4636a81ebeb
  picking 6:c4636a81ebeb "add c"
  merging c
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts (see hg help resolve)
  [1]

  $ echo foobar > c
  $ hg resolve --all --mark
  (no more unresolved files)
  continue: hg pick --continue
  $ hg pick --continue
  $ hg glog
  @  8:44e155eb95c7 add c
  |
  o  7:2ccc03d1d096 foo to c
  |

  created new head

  $ hg up 44e155eb95c7
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg pick 4e04628911f6
  picking 9:4e04628911f6 "foo to c"
  merging c
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts (see hg help resolve)
  [1]
  $ echo foobar > c
  $ hg resolve -m
  (no more unresolved files)
  continue: hg pick --continue

  $ hg pick --continue
  note: picking 9:4e04628911f6 created no changes to commit

Testing the abort functionality of hg pick

  $ echo foo > b
  $ hg ci -Aqm "foo to b"
  $ hg glog -r .^::
  hg: parse error at 4: not a prefix: end
  [255]

  $ hg pick -r 7c15c05db6fa
  picking 5:7c15c05db6fa "add b"
  merging b
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts (see hg help resolve)
  [1]

  $ hg pick --abort
  aborting pick, updating to c437988de89f

  $ hg glog
  @  10:c437988de89f foo to b
  |
  o  8:44e155eb95c7 add c

Trying to grab a public changeset

  $ hg phase -r 7c15c05db6fa -p

  $ hg pick -r 7c15c05db6fa
  abort: cannot pick public changesets: 7c15c05db6fa
  (see 'hg help phases' for details)
  [255]

  $ hg glog
  @  10:c437988de89f foo to b

In case of merge conflicts

  $ hg phase -r 7c15c05db6fa -s -f

  $ hg pick -r 7c15c05db6fa
  picking 5:7c15c05db6fa "add b"
  merging b
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
  unresolved merge conflicts (see hg help resolve)
  [1]

  $ echo bar > b
  $ hg resolve -m
  (no more unresolved files)
  continue: hg pick --continue

  $ hg pick --continue
  $ hg phase -r .
  11: secret

No merge conflicts

  o  0:1f0dee641bb7 add a
  
  $ hg up 10427de9e26e
  3 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ hg pick -r 508d572e7053
  picking 12:508d572e7053 "added l"

  $ hg phase -r .
  13: secret