tests/test-graft-interrupted.t
author Augie Fackler <augie@google.com>
Wed, 05 Jan 2022 13:36:05 -0500
changeset 48539 b9d5ad7146a3
parent 45840 527ce85c2e60
permissions -rw-r--r--
git: add opener attribute to gitstore Differential Revision: https://phab.mercurial-scm.org/D11958
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
42582
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
     1
#testcases abortcommand abortflag
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
     2
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
     3
#if abortflag
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
     4
  $ cat >> $HGRCPATH <<EOF
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
     5
  > [alias]
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
     6
  > abort = graft --abort
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
     7
  > EOF
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
     8
#endif
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
     9
40656
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
    10
38149
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    11
Testing the reading of old format graftstate file with newer mercurial
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    12
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    13
  $ hg init oldgraft
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    14
  $ cd oldgraft
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    15
  $ for ch in a b c; do echo foo > $ch; hg add $ch; hg ci -Aqm "added "$ch; done;
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    16
  $ hg log -GT "{rev}:{node|short} {desc}\n"
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    17
  @  2:8be98ac1a569 added c
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    18
  |
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    19
  o  1:80e6d2c47cfe added b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    20
  |
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    21
  o  0:f7ad41964313 added a
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    22
  
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    23
  $ hg up 0
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    24
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    25
  $ echo bar > b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    26
  $ hg add b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    27
  $ hg ci -m "bar to b"
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    28
  created new head
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    29
  $ hg graft -r 1 -r 2
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    30
  grafting 1:80e6d2c47cfe "added b"
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    31
  merging b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    32
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    33
  abort: unresolved conflicts, can't continue
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    34
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
    35
  [1]
38149
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    36
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    37
Writing the nodes in old format to graftstate
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    38
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    39
  $ hg log -r 1 -r 2 -T '{node}\n' > .hg/graftstate
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    40
  $ echo foo > b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    41
  $ hg resolve -m
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    42
  (no more unresolved files)
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    43
  continue: hg graft --continue
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    44
  $ hg graft --continue
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    45
  grafting 1:80e6d2c47cfe "added b"
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
    46
  grafting 2:8be98ac1a569 "added c"
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    47
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    48
Testing that --user is preserved during conflicts and value is reused while
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    49
running `hg graft --continue`
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    50
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    51
  $ hg log -G
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    52
  @  changeset:   5:711e9fa999f1
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    53
  |  tag:         tip
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    54
  |  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    55
  |  date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    56
  |  summary:     added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    57
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    58
  o  changeset:   4:e5ad7353b408
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    59
  |  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    60
  |  date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    61
  |  summary:     added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    62
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    63
  o  changeset:   3:9e887f7a939c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    64
  |  parent:      0:f7ad41964313
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    65
  |  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    66
  |  date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    67
  |  summary:     bar to b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    68
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    69
  | o  changeset:   2:8be98ac1a569
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    70
  | |  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    71
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    72
  | |  summary:     added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    73
  | |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    74
  | o  changeset:   1:80e6d2c47cfe
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    75
  |/   user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    76
  |    date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    77
  |    summary:     added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    78
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    79
  o  changeset:   0:f7ad41964313
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    80
     user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    81
     date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    82
     summary:     added a
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    83
  
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    84
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    85
  $ hg up '.^^'
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    86
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    87
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    88
  $ hg graft -r 1 -r 2 --user batman
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    89
  grafting 1:80e6d2c47cfe "added b"
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    90
  merging b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    91
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    92
  abort: unresolved conflicts, can't continue
38155
5736570718fe graft: drop --user and --date values info from hint in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38154
diff changeset
    93
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
    94
  [1]
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    95
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    96
  $ echo wat > b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    97
  $ hg resolve -m
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    98
  (no more unresolved files)
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
    99
  continue: hg graft --continue
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   100
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   101
  $ hg graft --continue
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   102
  grafting 1:80e6d2c47cfe "added b"
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   103
  grafting 2:8be98ac1a569 "added c"
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   104
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   105
  $ hg log -Gr 3::
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
   106
  @  changeset:   7:11a36ffaacf2
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   107
  |  tag:         tip
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
   108
  |  user:        batman
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   109
  |  date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   110
  |  summary:     added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   111
  |
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
   112
  o  changeset:   6:76803afc6511
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   113
  |  parent:      3:9e887f7a939c
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
   114
  |  user:        batman
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   115
  |  date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   116
  |  summary:     added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   117
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   118
  | o  changeset:   5:711e9fa999f1
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   119
  | |  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   120
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   121
  | |  summary:     added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   122
  | |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   123
  | o  changeset:   4:e5ad7353b408
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   124
  |/   user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   125
  |    date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   126
  |    summary:     added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   127
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   128
  o  changeset:   3:9e887f7a939c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   129
  |  parent:      0:f7ad41964313
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   130
  ~  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   131
     date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   132
     summary:     bar to b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   133
  
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   134
Test that --date is preserved and reused in `hg graft --continue`
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   135
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   136
  $ hg up '.^^'
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   137
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   138
  $ hg graft -r 1 -r 2 --date '1234560000 120'
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   139
  grafting 1:80e6d2c47cfe "added b"
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   140
  merging b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   141
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   142
  abort: unresolved conflicts, can't continue
38155
5736570718fe graft: drop --user and --date values info from hint in case of conflicts
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38154
diff changeset
   143
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
   144
  [1]
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   145
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   146
  $ echo foobar > b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   147
  $ hg resolve -m
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   148
  (no more unresolved files)
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   149
  continue: hg graft --continue
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   150
  $ hg graft --continue
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   151
  grafting 1:80e6d2c47cfe "added b"
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   152
  grafting 2:8be98ac1a569 "added c"
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   154
  $ hg log -Gr '.^^::.'
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
   155
  @  changeset:   9:1896b76e007a
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   156
  |  tag:         tip
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   157
  |  user:        test
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
   158
  |  date:        Fri Feb 13 21:18:00 2009 -0002
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   159
  |  summary:     added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   160
  |
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
   161
  o  changeset:   8:ce2b4f1632af
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   162
  |  parent:      3:9e887f7a939c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   163
  |  user:        test
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
   164
  |  date:        Fri Feb 13 21:18:00 2009 -0002
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   165
  |  summary:     added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   166
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   167
  o  changeset:   3:9e887f7a939c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   168
  |  parent:      0:f7ad41964313
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   169
  ~  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   170
     date:        Thu Jan 01 00:00:00 1970 +0000
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   171
     summary:     bar to b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
   172
  
38237
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   173
Test that --log is preserved and reused in `hg graft --continue`
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   174
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   175
  $ hg up '.^^'
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   176
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   177
  $ hg graft -r 1 -r 2 --log
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   178
  grafting 1:80e6d2c47cfe "added b"
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   179
  merging b
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   180
  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   181
  abort: unresolved conflicts, can't continue
38238
2b8c8b8d1a06 graft: reuse the --log value passed initially in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38237
diff changeset
   182
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
   183
  [1]
38237
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   184
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   185
  $ echo foobar > b
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   186
  $ hg resolve -m
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   187
  (no more unresolved files)
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   188
  continue: hg graft --continue
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   189
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   190
  $ hg graft --continue
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   191
  grafting 1:80e6d2c47cfe "added b"
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   192
  grafting 2:8be98ac1a569 "added c"
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   193
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   194
  $ hg log -GT "{rev}:{node|short} {desc}" -r '.^^::.'
38238
2b8c8b8d1a06 graft: reuse the --log value passed initially in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38237
diff changeset
   195
  @  11:30c1050a58b2 added c
2b8c8b8d1a06 graft: reuse the --log value passed initially in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38237
diff changeset
   196
  |  (grafted from 8be98ac1a56990c2d9ca6861041b8390af7bd6f3)
2b8c8b8d1a06 graft: reuse the --log value passed initially in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38237
diff changeset
   197
  o  10:ec7eda2313e2 added b
2b8c8b8d1a06 graft: reuse the --log value passed initially in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38237
diff changeset
   198
  |  (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6)
38237
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   199
  o  3:9e887f7a939c bar to b
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   200
  |
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
   201
  ~
38280
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   202
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   203
  $ cd ..
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   204
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   205
Testing the --stop flag of `hg graft` which stops the interrupted graft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   206
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   207
  $ hg init stopgraft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   208
  $ cd stopgraft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   209
  $ for ch in a b c d; do echo $ch > $ch; hg add $ch; hg ci -Aqm "added "$ch; done;
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   210
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   211
  $ hg log -G
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   212
  @  changeset:   3:9150fe93bec6
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   213
  |  tag:         tip
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   214
  |  user:        test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   215
  |  date:        Thu Jan 01 00:00:00 1970 +0000
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   216
  |  summary:     added d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   217
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   218
  o  changeset:   2:155349b645be
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   219
  |  user:        test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   220
  |  date:        Thu Jan 01 00:00:00 1970 +0000
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   221
  |  summary:     added c
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   222
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   223
  o  changeset:   1:5f6d8a4bf34a
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   224
  |  user:        test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   225
  |  date:        Thu Jan 01 00:00:00 1970 +0000
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   226
  |  summary:     added b
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   227
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   228
  o  changeset:   0:9092f1db7931
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   229
     user:        test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   230
     date:        Thu Jan 01 00:00:00 1970 +0000
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   231
     summary:     added a
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   232
  
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   233
  $ hg up '.^^'
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   234
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   235
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   236
  $ echo foo > d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   237
  $ hg ci -Aqm "added foo to d"
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   238
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   239
  $ hg graft --stop
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   240
  abort: no interrupted graft found
45840
527ce85c2e60 errors: introduce StateError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45827
diff changeset
   241
  [20]
38280
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   242
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   243
  $ hg graft -r 3
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   244
  grafting 3:9150fe93bec6 "added d"
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   245
  merging d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   246
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   247
  abort: unresolved conflicts, can't continue
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   248
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
   249
  [1]
38280
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   250
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   251
  $ hg graft --stop --continue
45009
7d494425167c graft: leverage cmdutil.check_at_most_one_arg() for --abort/--stop/--continue
Martin von Zweigbergk <martinvonz@google.com>
parents: 44725
diff changeset
   252
  abort: cannot specify both --stop and --continue
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45448
diff changeset
   253
  [10]
38280
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   254
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   255
  $ hg graft --stop -U
45014
6118ad07b98d graft: leverage cmdutil.check_incompatible_arguments() for --abort/--stop
Martin von Zweigbergk <martinvonz@google.com>
parents: 45010
diff changeset
   256
  abort: cannot specify both --stop and --user
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45448
diff changeset
   257
  [10]
38280
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   258
  $ hg graft --stop --rev 4
45014
6118ad07b98d graft: leverage cmdutil.check_incompatible_arguments() for --abort/--stop
Martin von Zweigbergk <martinvonz@google.com>
parents: 45010
diff changeset
   259
  abort: cannot specify both --stop and --rev
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45448
diff changeset
   260
  [10]
38280
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   261
  $ hg graft --stop --log
45014
6118ad07b98d graft: leverage cmdutil.check_incompatible_arguments() for --abort/--stop
Martin von Zweigbergk <martinvonz@google.com>
parents: 45010
diff changeset
   262
  abort: cannot specify both --stop and --log
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45448
diff changeset
   263
  [10]
38280
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   264
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   265
  $ hg graft --stop
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   266
  stopped the interrupted graft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   267
  working directory is now at a0deacecd59d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   268
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   269
  $ hg diff
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   270
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   271
  $ hg log -Gr '.'
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   272
  @  changeset:   4:a0deacecd59d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   273
  |  tag:         tip
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   274
  ~  parent:      1:5f6d8a4bf34a
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   275
     user:        test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   276
     date:        Thu Jan 01 00:00:00 1970 +0000
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   277
     summary:     added foo to d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   278
  
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   279
  $ hg graft -r 2 -r 3
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   280
  grafting 2:155349b645be "added c"
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   281
  grafting 3:9150fe93bec6 "added d"
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   282
  merging d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   283
  warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   284
  abort: unresolved conflicts, can't continue
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   285
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
   286
  [1]
38280
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   287
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   288
  $ hg graft --stop
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   289
  stopped the interrupted graft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   290
  working directory is now at 75b447541a9e
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   291
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   292
  $ hg diff
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   293
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   294
  $ hg log -G -T "{rev}:{node|short} {desc}"
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   295
  @  5:75b447541a9e added c
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   296
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   297
  o  4:a0deacecd59d added foo to d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   298
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   299
  | o  3:9150fe93bec6 added d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   300
  | |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   301
  | o  2:155349b645be added c
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   302
  |/
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   303
  o  1:5f6d8a4bf34a added b
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   304
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   305
  o  0:9092f1db7931 added a
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
   306
  
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   307
  $ cd ..
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   308
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   309
Testing the --abort flag for `hg graft` which aborts and rollback to state
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   310
before the graft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   311
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   312
  $ hg init abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   313
  $ cd abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   314
  $ for ch in a b c d; do echo $ch > $ch; hg add $ch; hg ci -Aqm "added "$ch; done;
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   315
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   316
  $ hg up '.^^'
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   317
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   318
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   319
  $ echo x > x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   320
  $ hg ci -Aqm "added x"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   321
  $ hg up '.^'
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   322
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   323
  $ echo foo > c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   324
  $ hg ci -Aqm "added foo to c"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   325
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   326
  $ hg log -GT "{rev}:{node|short} {desc}"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   327
  @  5:36b793615f78 added foo to c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   328
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   329
  | o  4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   330
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   331
  | o  3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   332
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   333
  | o  2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   334
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   335
  o  1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   336
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   337
  o  0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   338
  
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   339
  $ hg up 9150fe93bec6
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   340
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   341
42582
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   342
  $ hg abort
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   343
  abort: no interrupted graft to abort (abortflag !)
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   344
  abort: no operation in progress (abortcommand !)
45840
527ce85c2e60 errors: introduce StateError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45827
diff changeset
   345
  [20]
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   346
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   347
when stripping is required
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   348
  $ hg graft -r 4 -r 5
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   349
  grafting 4:863a25e1a9ea "added x"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   350
  grafting 5:36b793615f78 "added foo to c" (tip)
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   351
  merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   352
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   353
  abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   354
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
   355
  [1]
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   356
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   357
  $ hg graft --continue --abort
45009
7d494425167c graft: leverage cmdutil.check_at_most_one_arg() for --abort/--stop/--continue
Martin von Zweigbergk <martinvonz@google.com>
parents: 44725
diff changeset
   358
  abort: cannot specify both --abort and --continue
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45448
diff changeset
   359
  [10]
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   360
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   361
  $ hg graft --abort --stop
45009
7d494425167c graft: leverage cmdutil.check_at_most_one_arg() for --abort/--stop/--continue
Martin von Zweigbergk <martinvonz@google.com>
parents: 44725
diff changeset
   362
  abort: cannot specify both --abort and --stop
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45448
diff changeset
   363
  [10]
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   364
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   365
  $ hg graft --abort --currentuser
45014
6118ad07b98d graft: leverage cmdutil.check_incompatible_arguments() for --abort/--stop
Martin von Zweigbergk <martinvonz@google.com>
parents: 45010
diff changeset
   366
  abort: cannot specify both --abort and --user
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45448
diff changeset
   367
  [10]
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   368
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   369
  $ hg graft --abort --edit
45014
6118ad07b98d graft: leverage cmdutil.check_incompatible_arguments() for --abort/--stop
Martin von Zweigbergk <martinvonz@google.com>
parents: 45010
diff changeset
   370
  abort: cannot specify both --abort and --edit
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45448
diff changeset
   371
  [10]
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   372
42582
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   373
#if abortcommand
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   374
when in dry-run mode
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   375
  $ hg abort --dry-run
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   376
  graft in progress, will be aborted
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   377
#endif
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   378
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   379
  $ hg abort
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   380
  graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   381
  working directory is now at 9150fe93bec6
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   382
  $ hg log -GT "{rev}:{node|short} {desc}"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   383
  o  5:36b793615f78 added foo to c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   384
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   385
  | o  4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   386
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   387
  | @  3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   388
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   389
  | o  2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   390
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   391
  o  1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   392
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   393
  o  0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   394
  
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   395
when stripping is not required
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   396
  $ hg graft -r 5
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   397
  grafting 5:36b793615f78 "added foo to c" (tip)
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   398
  merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   399
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   400
  abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   401
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
   402
  [1]
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   403
42582
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   404
  $ hg abort
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   405
  graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   406
  working directory is now at 9150fe93bec6
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   407
  $ hg log -GT "{rev}:{node|short} {desc}"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   408
  o  5:36b793615f78 added foo to c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   409
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   410
  | o  4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   411
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   412
  | @  3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   413
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   414
  | o  2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   415
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   416
  o  1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   417
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   418
  o  0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   419
  
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   420
when some of the changesets became public
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   421
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   422
  $ hg graft -r 4 -r 5
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   423
  grafting 4:863a25e1a9ea "added x"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   424
  grafting 5:36b793615f78 "added foo to c" (tip)
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   425
  merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   426
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   427
  abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   428
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
   429
  [1]
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   430
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   431
  $ hg log -GT "{rev}:{node|short} {desc}"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   432
  @  6:6ec71c037d94 added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   433
  |
44345
14d0e89520a2 graphlog: use '%' for other context in merge conflict
Martin von Zweigbergk <martinvonz@google.com>
parents: 44040
diff changeset
   434
  | %  5:36b793615f78 added foo to c
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   435
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   436
  | | o  4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   437
  | |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   438
  o |  3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   439
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   440
  o |  2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   441
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   442
  o  1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   443
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   444
  o  0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   445
  
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   446
  $ hg phase -r 6 --public
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   447
42582
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   448
  $ hg abort
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   449
  cannot clean up public changesets 6ec71c037d94
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   450
  graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   451
  working directory is now at 6ec71c037d94
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   452
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   453
when we created new changesets on top of existing one
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   454
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   455
  $ hg up '.^^'
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   456
  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   457
  $ echo y > y
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   458
  $ hg ci -Aqm "added y"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   459
  $ echo z > z
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   460
  $ hg ci -Aqm "added z"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   461
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   462
  $ hg up 3
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   463
  1 files updated, 0 files merged, 3 files removed, 0 files unresolved
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   464
  $ hg log -GT "{rev}:{node|short} {desc}"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   465
  o  8:637f9e9bbfd4 added z
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   466
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   467
  o  7:123221671fd4 added y
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   468
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   469
  | o  6:6ec71c037d94 added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   470
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   471
  | | o  5:36b793615f78 added foo to c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   472
  | | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   473
  | | | o  4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   474
  | | |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   475
  | @ |  3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   476
  |/ /
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   477
  o /  2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   478
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   479
  o  1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   480
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   481
  o  0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   482
  
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   483
  $ hg graft -r 8 -r 7 -r 5
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   484
  grafting 8:637f9e9bbfd4 "added z" (tip)
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   485
  grafting 7:123221671fd4 "added y"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   486
  grafting 5:36b793615f78 "added foo to c"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   487
  merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   488
  warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   489
  abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   490
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
   491
  [1]
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   492
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   493
  $ cd ..
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   494
  $ hg init pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   495
  $ cd pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   496
  $ cat >> .hg/hgrc <<EOF
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   497
  > [phases]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   498
  > publish=False
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   499
  > EOF
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   500
  $ hg pull ../abortgraft --config phases.publish=False
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   501
  pulling from ../abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   502
  requesting all changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   503
  adding changesets
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   504
  adding manifests
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   505
  adding file changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   506
  added 11 changesets with 9 changes to 8 files (+4 heads)
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 39187
diff changeset
   507
  new changesets 9092f1db7931:6b98ff0062dd (6 drafts)
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   508
  (run 'hg heads' to see heads, 'hg merge' to merge)
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   509
  $ hg up 9
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   510
  5 files updated, 0 files merged, 0 files removed, 0 files unresolved
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   511
  $ echo w > w
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   512
  $ hg ci -Aqm "added w" --config phases.publish=False
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   513
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   514
  $ cd ../abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   515
  $ hg pull ../pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   516
  pulling from ../pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   517
  searching for changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   518
  adding changesets
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   519
  adding manifests
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   520
  adding file changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   521
  added 1 changesets with 1 changes to 1 files (+1 heads)
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 39187
diff changeset
   522
  new changesets 311dfc6cf3bf (1 drafts)
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   523
  (run 'hg heads .' to see heads, 'hg merge' to merge)
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   524
42582
5171937ad0f9 abort: added support for graft
Taapas Agrawal <taapas2897@gmail.com>
parents: 42532
diff changeset
   525
  $ hg abort
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   526
  new changesets detected on destination branch, can't strip
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   527
  graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
   528
  working directory is now at 6b98ff0062dd
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   529
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   530
  $ cd ..
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   531
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   532
============================
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   533
Testing --no-commit option:|
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   534
============================
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   535
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   536
  $ hg init nocommit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   537
  $ cd nocommit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   538
  $ echo a > a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   539
  $ hg ci -qAma
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   540
  $ echo b > b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   541
  $ hg ci -qAmb
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   542
  $ hg up -q 0
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   543
  $ echo c > c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   544
  $ hg ci -qAmc
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   545
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   546
  @  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   547
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   548
  | o  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   549
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   550
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   551
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   552
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   553
Check reporting when --no-commit used with non-applicable options:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   554
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   555
  $ hg graft 1 --no-commit -e
45010
c63a297fb964 graft: leverage cmdutil.check_incompatible_arguments() for --no-commit
Martin von Zweigbergk <martinvonz@google.com>
parents: 45009
diff changeset
   556
  abort: cannot specify both --no-commit and --edit
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45448
diff changeset
   557
  [10]
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   558
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   559
  $ hg graft 1 --no-commit --log
45010
c63a297fb964 graft: leverage cmdutil.check_incompatible_arguments() for --no-commit
Martin von Zweigbergk <martinvonz@google.com>
parents: 45009
diff changeset
   560
  abort: cannot specify both --no-commit and --log
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45448
diff changeset
   561
  [10]
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   562
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   563
  $ hg graft 1 --no-commit -D
45010
c63a297fb964 graft: leverage cmdutil.check_incompatible_arguments() for --no-commit
Martin von Zweigbergk <martinvonz@google.com>
parents: 45009
diff changeset
   564
  abort: cannot specify both --no-commit and --currentdate
45827
8d72e29ad1e0 errors: introduce InputError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents: 45448
diff changeset
   565
  [10]
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   566
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   567
Test --no-commit is working:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   568
  $ hg graft 1 --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   569
  grafting 1:d2ae7f538514 "b"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   570
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   571
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   572
  @  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   573
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   574
  | o  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   575
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   576
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   577
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   578
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   579
  $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   580
  diff -r d36c0562f908 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   581
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   582
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   583
  @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   584
  +b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   585
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   586
Prepare wrdir to check --no-commit is resepected after --continue:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   587
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   588
  $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   589
  $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   590
  $ hg ci -qm "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   591
  $ hg up -q 1
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   592
  $ echo B>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   593
  $ hg ci -qm "B in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   594
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   595
  @  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   596
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   597
  | o  3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   598
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   599
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   600
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   601
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   602
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   603
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   604
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   605
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   606
  $ hg graft 3 --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   607
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   608
  merging a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   609
  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   610
  abort: unresolved conflicts, can't continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   611
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
   612
  [1]
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   613
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   614
Resolve conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   615
  $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   616
  $ hg resolve --mark
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   617
  (no more unresolved files)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   618
  continue: hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   619
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   620
  $ hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   621
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   622
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   623
  @  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   624
  |
45448
85b03b1e4715 graphlog: use '%' only if there are *unresolved* conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents: 45014
diff changeset
   625
  | o  3:09e253b87e17 A in file a
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   626
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   627
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   628
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   629
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   630
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   631
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   632
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   633
  $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   634
  diff -r 2aa9ad1006ff a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   635
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   636
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   637
  @@ -1,1 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   638
  -B
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   639
  +A
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   640
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   641
  $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   642
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   643
Check --no-commit is resepected when passed with --continue:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   644
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   645
  $ hg graft 3
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   646
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   647
  merging a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   648
  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   649
  abort: unresolved conflicts, can't continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   650
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
   651
  [1]
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   652
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   653
Resolve conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   654
  $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   655
  $ hg resolve --mark
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   656
  (no more unresolved files)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   657
  continue: hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   658
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   659
  $ hg graft --continue --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   660
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   661
  $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   662
  diff -r 2aa9ad1006ff a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   663
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   664
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   665
  @@ -1,1 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   666
  -B
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   667
  +A
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   668
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   669
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   670
  @  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   671
  |
45448
85b03b1e4715 graphlog: use '%' only if there are *unresolved* conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents: 45014
diff changeset
   672
  | o  3:09e253b87e17 A in file a
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   673
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   674
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   675
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   676
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   677
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   678
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   679
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   680
  $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   681
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   682
Test --no-commit when graft multiple revisions:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   683
When there is conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   684
  $ hg graft -r "2::3" --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   685
  grafting 2:d36c0562f908 "c"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   686
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   687
  merging a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   688
  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   689
  abort: unresolved conflicts, can't continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   690
  (use 'hg resolve' and 'hg graft --continue')
44725
16c361152133 graft: exit 1 on conflicts, like merge
Valentin Gatien-Baron <vgatien-baron@janestreet.com>
parents: 44345
diff changeset
   691
  [1]
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   692
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   693
  $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   694
  $ hg resolve --mark
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   695
  (no more unresolved files)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   696
  continue: hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   697
  $ hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   698
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   699
  $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   700
  diff -r 2aa9ad1006ff a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   701
  --- a/a	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   702
  +++ b/a	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   703
  @@ -1,1 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   704
  -B
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   705
  +A
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   706
  diff -r 2aa9ad1006ff c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   707
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   708
  +++ b/c	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   709
  @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   710
  +c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   711
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   712
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   713
  @  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   714
  |
45448
85b03b1e4715 graphlog: use '%' only if there are *unresolved* conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents: 45014
diff changeset
   715
  | o  3:09e253b87e17 A in file a
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   716
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   717
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   718
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   719
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   720
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   721
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   722
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   723
  $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   724
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   725
When there is no conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   726
  $ echo d>d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   727
  $ hg add d -q
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   728
  $ hg ci -qmd
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   729
  $ hg up 3 -q
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   730
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   731
  o  5:baefa8927fc0 d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   732
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   733
  o  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   734
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   735
  | @  3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   736
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   737
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   738
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   739
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   740
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   741
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   742
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   743
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   744
  $ hg graft -r 1 -r 5 --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   745
  grafting 1:d2ae7f538514 "b"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   746
  grafting 5:baefa8927fc0 "d" (tip)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   747
  $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   748
  diff -r 09e253b87e17 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   749
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   750
  +++ b/b	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   751
  @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   752
  +b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   753
  diff -r 09e253b87e17 d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   754
  --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   755
  +++ b/d	Thu Jan 01 00:00:00 1970 +0000
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   756
  @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   757
  +d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   758
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   759
  o  5:baefa8927fc0 d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   760
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   761
  o  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   762
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   763
  | @  3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   764
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   765
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   766
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   767
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   768
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   769
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   770
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
   771
  $ cd ..