tests/test-graft.t
author Gregory Szorc <gregory.szorc@gmail.com>
Thu, 02 Aug 2018 09:53:22 -0700
changeset 38886 66cf046ef60f
parent 38473 622f79e3a1cb
child 38966 5b04b6204931
permissions -rw-r--r--
changegroup: move revchunk() from narrow The monkeypatched revchunk for ellipses serving is a completely independent implementation. We model it as such in the changegroup code. revchunk() is now a simple proxy function. Again, I wish we had better APIs here. Especially since this narrow code is part of cg1packer and cg1packer can't be used with narrow. Class inheritance is wonky. And I will definitely be making changes to changegroup code for delta generation. As part of the code move, `node.nullrev` was replaced by `nullrev`. And a reference to `orig` was replaced to call `self._revchunknormal` directly. Differential Revision: https://phab.mercurial-scm.org/D4063
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28011
diff changeset
     1
  $ cat >> $HGRCPATH <<EOF
28052
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
     2
  > [extdiff]
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
     3
  > # for portability:
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
     4
  > pdiff = sh "$RUNTESTDIR/pdiff"
28033
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28011
diff changeset
     5
  > EOF
0707bbec682d tests: omit -p for external diff via extdiff extension for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28011
diff changeset
     6
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     7
Create a repo with some stuff in it:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     8
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     9
  $ hg init a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    10
  $ cd a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    11
  $ echo a > a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    12
  $ echo a > d
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    13
  $ echo a > e
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    14
  $ hg ci -qAm0
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    15
  $ echo b > a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    16
  $ hg ci -m1 -u bar
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    17
  $ hg mv a b
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    18
  $ hg ci -m2
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    19
  $ hg cp b c
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    20
  $ hg ci -m3 -u baz
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    21
  $ echo b > d
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    22
  $ echo f > e
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    23
  $ hg ci -m4
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    24
  $ hg up -q 3
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    25
  $ echo b > e
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    26
  $ hg branch -q stable
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    27
  $ hg ci -m5
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    28
  $ hg merge -q default --tool internal:local
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    29
  $ hg branch -q default
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    30
  $ hg ci -m6
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    31
  $ hg phase --public 3
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    32
  $ hg phase --force --secret 6
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    33
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19893
diff changeset
    34
  $ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    35
  @    test@6.secret: 6
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    36
  |\
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    37
  | o  test@5.draft: 5
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    38
  | |
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    39
  o |  test@4.draft: 4
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    40
  |/
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    41
  o  baz@3.public: 3
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    42
  |
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    43
  o  test@2.public: 2
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    44
  |
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    45
  o  bar@1.public: 1
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    46
  |
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    47
  o  test@0.public: 0
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
    48
  
28121
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
    49
Can't continue without starting:
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
    50
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
    51
  $ hg rm -q e
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
    52
  $ hg graft --continue
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
    53
  abort: no graft in progress
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
    54
  [255]
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
    55
  $ hg revert -r . -q e
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    56
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    57
Need to specify a rev:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    58
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    59
  $ hg graft
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    60
  abort: no revisions specified
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    61
  [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    62
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    63
Can't graft ancestor:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    64
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    65
  $ hg graft 1 2
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
    66
  skipping ancestor revision 1:5d205f8b35b6
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
    67
  skipping ancestor revision 2:5c095ad7e90f
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    68
  [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    69
16992
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
    70
Specify revisions with -r:
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
    71
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
    72
  $ hg graft -r 1 -r 2
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
    73
  skipping ancestor revision 1:5d205f8b35b6
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
    74
  skipping ancestor revision 2:5c095ad7e90f
16992
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
    75
  [255]
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
    76
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
    77
  $ hg graft -r 1 2
27899
78b9fdb844c1 graft: warn when -r is combined with revisions as positional arguments
Mads Kiilerich <madski@unity3d.com>
parents: 27625
diff changeset
    78
  warning: inconsistent use of --rev might give unexpected revision ordering!
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
    79
  skipping ancestor revision 2:5c095ad7e90f
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
    80
  skipping ancestor revision 1:5d205f8b35b6
16992
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
    81
  [255]
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
    82
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    83
Can't graft with dirty wd:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    84
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    85
  $ hg up -q 0
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    86
  $ echo foo > a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    87
  $ hg graft 1
19804
061ce98c888d cmdutil.bailifchanged: standardize error message for dirty working dir
Siddharth Agarwal <sid0@fb.com>
parents: 19476
diff changeset
    88
  abort: uncommitted changes
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    89
  [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    90
  $ hg revert a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    91
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    92
Graft a rename:
21416
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
    93
(this also tests that editor is invoked if '--edit' is specified)
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    94
21416
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
    95
  $ hg status --rev "2^1" --rev 2
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
    96
  A b
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
    97
  R a
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
    98
  $ HGEDITOR=cat hg graft 2 -u foo --edit
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
    99
  grafting 2:5c095ad7e90f "2"
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   100
  merging a and b to b
21416
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
   101
  2
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
   102
  
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
   103
  
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
   104
  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
   105
  HG: Leave message empty to abort commit.
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
   106
  HG: --
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
   107
  HG: user: foo
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
   108
  HG: branch 'default'
22897
8fe74328f700 dirstate: merge falls through to otherparent
Matt Mackall <mpm@selenic.com>
parents: 22305
diff changeset
   109
  HG: added b
21416
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
   110
  HG: removed a
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   111
  $ hg export tip --git
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   112
  # HG changeset patch
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   113
  # User foo
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   114
  # Date 0 0
18648
76b69cccb07a export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents: 18631
diff changeset
   115
  #      Thu Jan 01 00:00:00 1970 +0000
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   116
  # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   117
  # Parent  68795b066622ca79a25816a662041d8f78f3cd9e
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   118
  2
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   119
  
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   120
  diff --git a/a b/b
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   121
  rename from a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   122
  rename to b
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   123
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   124
Look for extra:source
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   125
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   126
  $ hg log --debug -r tip
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   127
  changeset:   7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   128
  tag:         tip
15907
51fc43253a52 changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15777
diff changeset
   129
  phase:       draft
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   130
  parent:      0:68795b066622ca79a25816a662041d8f78f3cd9e
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   131
  parent:      -1:0000000000000000000000000000000000000000
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   132
  manifest:    7:e59b6b228f9cbf9903d5e9abf996e083a1f533eb
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   133
  user:        foo
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   134
  date:        Thu Jan 01 00:00:00 1970 +0000
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   135
  files+:      b
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   136
  files-:      a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   137
  extra:       branch=default
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   138
  extra:       source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   139
  description:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   140
  2
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   141
  
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   142
  
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   143
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   144
Graft out of order, skipping a merge and a duplicate
21416
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
   145
(this also tests that editor is not invoked if '--edit' is not specified)
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   146
16389
79fecd735d26 graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents: 16094
diff changeset
   147
  $ hg graft 1 5 4 3 'merge()' 2 -n
79fecd735d26 graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents: 16094
diff changeset
   148
  skipping ungraftable merge revision 6
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
   149
  skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   150
  grafting 1:5d205f8b35b6 "1"
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   151
  grafting 5:97f8bfe72746 "5"
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   152
  grafting 4:9c233e8e184d "4"
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   153
  grafting 3:4c60f11aa304 "3"
16389
79fecd735d26 graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents: 16094
diff changeset
   154
27173
8a8f5d71a49a graft: improve --continue abort message
timeless <timeless@mozdev.org>
parents: 27172
diff changeset
   155
  $ HGEDITOR=cat hg graft 1 5 'merge()' 2 --debug
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   156
  skipping ungraftable merge revision 6
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   157
  scanning for duplicate grafts
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
   158
  skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   159
  grafting 1:5d205f8b35b6 "1"
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   160
    searching for copies back to rev 1
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   161
    unmatched files in local:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   162
     b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16660
diff changeset
   163
    all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 17186
diff changeset
   164
     src: 'a' -> dst: 'b' *
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   165
    checking for directory renames
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   166
  resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
   167
   branchmerge: True, force: True, partial: False
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   168
   ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
   169
   preserving b for resolve of b
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 28121
diff changeset
   170
  starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   171
   b: local copied/moved from a -> m (premerge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   172
  picked tool ':merge' for b (binary False symlink False changedelete False)
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   173
  merging b and a to b
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   174
  my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   175
   premerge successful
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
   176
  committing files:
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   177
  b
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
   178
  committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
   179
  committing changelog
32267
c2380b448265 caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 32245
diff changeset
   180
  updating the branch cache
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   181
  grafting 5:97f8bfe72746 "5"
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   182
    searching for copies back to rev 1
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
   183
    unmatched files in other (from topological common ancestor):
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
   184
     c
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   185
  resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
   186
   branchmerge: True, force: True, partial: False
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   187
   ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21267
diff changeset
   188
   e: remote is newer -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
   189
  getting e
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
   190
  committing files:
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   191
  e
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
   192
  committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
   193
  committing changelog
32267
c2380b448265 caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 32245
diff changeset
   194
  updating the branch cache
27173
8a8f5d71a49a graft: improve --continue abort message
timeless <timeless@mozdev.org>
parents: 27172
diff changeset
   195
  $ HGEDITOR=cat hg graft 4 3 --log --debug
8a8f5d71a49a graft: improve --continue abort message
timeless <timeless@mozdev.org>
parents: 27172
diff changeset
   196
  scanning for duplicate grafts
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   197
  grafting 4:9c233e8e184d "4"
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   198
    searching for copies back to rev 1
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
   199
    unmatched files in other (from topological common ancestor):
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
   200
     c
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   201
  resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
   202
   branchmerge: True, force: True, partial: False
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   203
   ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
   204
   preserving e for resolve of e
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21267
diff changeset
   205
   d: remote is newer -> g
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
   206
  getting d
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   207
   e: versions differ -> m (premerge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   208
  picked tool ':merge' for e (binary False symlink False changedelete False)
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   209
  merging e
28011
8abd9f785030 merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents: 27899
diff changeset
   210
  my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   211
   e: versions differ -> m (merge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   212
  picked tool ':merge' for e (binary False symlink False changedelete False)
28011
8abd9f785030 merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents: 27899
diff changeset
   213
  my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
   214
  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   215
  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
   216
  (use 'hg resolve' and 'hg graft --continue')
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   217
  [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   218
27172
4d61c847e06c summary: mention graft
timeless <timeless@mozdev.org>
parents: 27161
diff changeset
   219
Summary should mention graft:
4d61c847e06c summary: mention graft
timeless <timeless@mozdev.org>
parents: 27161
diff changeset
   220
4d61c847e06c summary: mention graft
timeless <timeless@mozdev.org>
parents: 27161
diff changeset
   221
  $ hg summary |grep graft
4d61c847e06c summary: mention graft
timeless <timeless@mozdev.org>
parents: 27161
diff changeset
   222
  commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)
4d61c847e06c summary: mention graft
timeless <timeless@mozdev.org>
parents: 27161
diff changeset
   223
33771
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   224
Using status to get more context
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   225
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   226
  $ hg status --verbose
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   227
  M d
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   228
  M e
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   229
  ? a.orig
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   230
  ? e.orig
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   231
  # The repository is in an unfinished *graft* state.
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   232
  
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   233
  # Unresolved merge conflicts:
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   234
  # 
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   235
  #     e
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   236
  # 
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   237
  # To mark files as resolved:  hg resolve --mark FILE
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   238
  
38341
50f5fc232c16 morestatus: remove some extra spaces
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38311
diff changeset
   239
  # To continue:    hg graft --continue
50f5fc232c16 morestatus: remove some extra spaces
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38311
diff changeset
   240
  # To abort:       hg update --clean . (warning: this will discard uncommitted changes)
33771
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   241
  
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
   242
19253
e078ea9b4ce4 graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents: 18648
diff changeset
   243
Commit while interrupted should fail:
e078ea9b4ce4 graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents: 18648
diff changeset
   244
e078ea9b4ce4 graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents: 18648
diff changeset
   245
  $ hg ci -m 'commit interrupted graft'
19476
4fed15d4c5aa commands: add checks for unfinished operations (issue3955)
Matt Mackall <mpm@selenic.com>
parents: 19332
diff changeset
   246
  abort: graft in progress
38311
47f5454a30ed cmdutil: say that `graft --stop` stops the graft instead of aborting
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38280
diff changeset
   247
  (use 'hg graft --continue' or 'hg graft --stop' to stop)
19253
e078ea9b4ce4 graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents: 18648
diff changeset
   248
  [255]
e078ea9b4ce4 graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents: 18648
diff changeset
   249
19332
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   250
Abort the graft and try committing:
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   251
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   252
  $ hg up -C .
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   253
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   254
  $ echo c >> e
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   255
  $ hg ci -mtest
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   256
23514
3575f42e1b7b test-graft: use strip extension instead of mq extension
Augie Fackler <raf@durin42.com>
parents: 23508
diff changeset
   257
  $ hg strip . --config extensions.strip=
19332
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   258
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   259
  saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   260
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   261
Graft again:
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   262
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   263
  $ hg graft 1 5 4 3 'merge()' 2
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   264
  skipping ungraftable merge revision 6
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
   265
  skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
   266
  skipping revision 1:5d205f8b35b6 (already grafted to 8:6b9e5368ca4e)
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
   267
  skipping revision 5:97f8bfe72746 (already grafted to 9:1905859650ec)
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   268
  grafting 4:9c233e8e184d "4"
19332
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   269
  merging e
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
   270
  warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
19332
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   271
  abort: unresolved conflicts, can't continue
28963
fc1d75e7a98d graft: use single quotes around command hint
timeless <timeless@mozdev.org>
parents: 28634
diff changeset
   272
  (use 'hg resolve' and 'hg graft --continue')
19332
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   273
  [255]
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
   274
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   275
Continue without resolve should fail:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   276
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   277
  $ hg graft -c
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   278
  grafting 4:9c233e8e184d "4"
29975
c15f06109b7a localrepo: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 28963
diff changeset
   279
  abort: unresolved merge conflicts (see 'hg help resolve')
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   280
  [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   281
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   282
Fix up:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   283
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   284
  $ echo b > e
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   285
  $ hg resolve -m e
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21765
diff changeset
   286
  (no more unresolved files)
27625
cdb9493a7e2f graft: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents: 27173
diff changeset
   287
  continue: hg graft --continue
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   288
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   289
Continue with a revision should fail:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   290
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   291
  $ hg graft -c 6
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   292
  abort: can't specify --continue and revisions
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   293
  [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   294
16992
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
   295
  $ hg graft -c -r 6
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
   296
  abort: can't specify --continue and revisions
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
   297
  [255]
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
   298
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   299
Continue for real, clobber usernames
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   300
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   301
  $ hg graft -c -U
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   302
  grafting 4:9c233e8e184d "4"
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   303
  grafting 3:4c60f11aa304 "3"
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   304
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   305
Compare with original:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   306
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   307
  $ hg diff -r 6
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   308
  $ hg status --rev 0:. -C
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   309
  M d
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   310
  M e
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   311
  A b
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   312
    a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   313
  A c
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   314
    a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   315
  R a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   316
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   317
View graph:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   318
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19893
diff changeset
   319
  $ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   320
  @  test@11.draft: 3
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   321
  |
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   322
  o  test@10.draft: 4
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   323
  |
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   324
  o  test@9.draft: 5
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   325
  |
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   326
  o  bar@8.draft: 1
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   327
  |
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
   328
  o  foo@7.draft: 2
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   329
  |
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
   330
  | o    test@6.secret: 6
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   331
  | |\
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
   332
  | | o  test@5.draft: 5
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   333
  | | |
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
   334
  | o |  test@4.draft: 4
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   335
  | |/
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
   336
  | o  baz@3.public: 3
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   337
  | |
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
   338
  | o  test@2.public: 2
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   339
  | |
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
   340
  | o  bar@1.public: 1
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   341
  |/
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
   342
  o  test@0.public: 0
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
   343
  
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   344
Graft again onto another branch should preserve the original source
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   345
  $ hg up -q 0
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   346
  $ echo 'g'>g
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   347
  $ hg add g
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   348
  $ hg ci -m 7
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   349
  created new head
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   350
  $ hg graft 7
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   351
  grafting 7:ef0ef43d49e7 "2"
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   352
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   353
  $ hg log -r 7 --template '{rev}:{node}\n'
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   354
  7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   355
  $ hg log -r 2 --template '{rev}:{node}\n'
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   356
  2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   357
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   358
  $ hg log --debug -r tip
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   359
  changeset:   13:7a4785234d87ec1aa420ed6b11afe40fa73e12a9
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   360
  tag:         tip
15907
51fc43253a52 changeset_printer: display changeset phase on debug level
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 15777
diff changeset
   361
  phase:       draft
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   362
  parent:      12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   363
  parent:      -1:0000000000000000000000000000000000000000
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   364
  manifest:    13:dc313617b8c32457c0d589e0dbbedfe71f3cd637
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   365
  user:        foo
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   366
  date:        Thu Jan 01 00:00:00 1970 +0000
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   367
  files+:      b
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   368
  files-:      a
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   369
  extra:       branch=default
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   370
  extra:       intermediate-source=ef0ef43d49e79e81ddafdc7997401ba0041efc82
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   371
  extra:       source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   372
  description:
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   373
  2
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   374
  
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
   375
  
15508
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   376
Disallow grafting an already grafted cset onto its original branch
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   377
  $ hg up -q 6
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   378
  $ hg graft 7
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
   379
  skipping already grafted revision 7:ef0ef43d49e7 (was grafted from 2:5c095ad7e90f)
15508
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   380
  [255]
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   381
28052
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
   382
  $ hg pdiff --config extensions.extdiff= --patch -r 2 -r 13
28034
e7ff258f71df tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28033
diff changeset
   383
  --- */hg-5c095ad7e90f.patch	* (glob)
e7ff258f71df tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28033
diff changeset
   384
  +++ */hg-7a4785234d87.patch	* (glob)
26228
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   385
  @@ -1,18 +1,18 @@
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   386
   # HG changeset patch
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   387
  -# User test
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   388
  +# User foo
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   389
   # Date 0 0
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   390
   #      Thu Jan 01 00:00:00 1970 +0000
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   391
  -# Node ID 5c095ad7e90f871700f02dd1fa5012cb4498a2d4
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   392
  -# Parent  5d205f8b35b66bc36375c9534ffd3237730e8f04
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   393
  +# Node ID 7a4785234d87ec1aa420ed6b11afe40fa73e12a9
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   394
  +# Parent  b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   395
   2
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   396
   
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   397
  -diff -r 5d205f8b35b6 -r 5c095ad7e90f a
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   398
  +diff -r b592ea63bb0c -r 7a4785234d87 a
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   399
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   400
   +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   401
   @@ -1,1 +0,0 @@
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   402
  --b
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   403
  -diff -r 5d205f8b35b6 -r 5c095ad7e90f b
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   404
  +-a
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   405
  +diff -r b592ea63bb0c -r 7a4785234d87 b
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   406
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   407
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   408
   @@ -0,0 +1,1 @@
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   409
  -+b
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   410
  ++a
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   411
  [1]
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   412
28052
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
   413
  $ hg pdiff --config extensions.extdiff= --patch -r 2 -r 13 -X .
28034
e7ff258f71df tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28033
diff changeset
   414
  --- */hg-5c095ad7e90f.patch	* (glob)
e7ff258f71df tests: make timezone in diff output glob-ed for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28033
diff changeset
   415
  +++ */hg-7a4785234d87.patch	* (glob)
26229
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   416
  @@ -1,8 +1,8 @@
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   417
   # HG changeset patch
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   418
  -# User test
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   419
  +# User foo
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   420
   # Date 0 0
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   421
   #      Thu Jan 01 00:00:00 1970 +0000
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   422
  -# Node ID 5c095ad7e90f871700f02dd1fa5012cb4498a2d4
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   423
  -# Parent  5d205f8b35b66bc36375c9534ffd3237730e8f04
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   424
  +# Node ID 7a4785234d87ec1aa420ed6b11afe40fa73e12a9
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   425
  +# Parent  b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   426
   2
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   427
   
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
   428
  [1]
26228
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
   429
15508
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   430
Disallow grafting already grafted csets with the same origin onto each other
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
   431
  $ hg up -q 13
15508
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   432
  $ hg graft 2
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   433
  skipping revision 2:5c095ad7e90f (already grafted to 13:7a4785234d87)
15508
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   434
  [255]
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   435
  $ hg graft 7
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   436
  skipping already grafted revision 7:ef0ef43d49e7 (13:7a4785234d87 also has origin 2:5c095ad7e90f)
15508
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   437
  [255]
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   438
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   439
  $ hg up -q 7
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   440
  $ hg graft 2
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
   441
  skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
15508
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   442
  [255]
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   443
  $ hg graft tip
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   444
  skipping already grafted revision 13:7a4785234d87 (7:ef0ef43d49e7 also has origin 2:5c095ad7e90f)
15508
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
   445
  [255]
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   446
16660
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
   447
Graft with --log
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
   448
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
   449
  $ hg up -Cq 1
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
   450
  $ hg graft 3 --log -u foo
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   451
  grafting 3:4c60f11aa304 "3"
16660
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
   452
  warning: can't find ancestor for 'c' copied from 'b'!
30188
8a864844d5a0 checkcopies: add a sanity check against false-positive copies
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29975
diff changeset
   453
  $ hg log --template '{rev}:{node|short} {parents} {desc}\n' -r tip
8a864844d5a0 checkcopies: add a sanity check against false-positive copies
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29975
diff changeset
   454
  14:0c921c65ef1e 1:5d205f8b35b6  3
16660
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
   455
  (grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8)
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16795
diff changeset
   456
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   457
Resolve conflicted graft
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   458
  $ hg up -q 0
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   459
  $ echo b > a
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   460
  $ hg ci -m 8
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   461
  created new head
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   462
  $ echo c > a
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   463
  $ hg ci -m 9
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   464
  $ hg graft 1 --tool internal:fail
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   465
  grafting 1:5d205f8b35b6 "1"
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   466
  abort: unresolved conflicts, can't continue
28963
fc1d75e7a98d graft: use single quotes around command hint
timeless <timeless@mozdev.org>
parents: 28634
diff changeset
   467
  (use 'hg resolve' and 'hg graft --continue')
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   468
  [255]
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   469
  $ hg resolve --all
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   470
  merging a
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
   471
  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   472
  [1]
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   473
  $ cat a
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   474
  <<<<<<< local: aaa4406d4f0a - test: 9
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   475
  c
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   476
  =======
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   477
  b
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30229
diff changeset
   478
  >>>>>>> graft: 5d205f8b35b6 - bar: 1
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   479
  $ echo b > a
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   480
  $ hg resolve -m a
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21765
diff changeset
   481
  (no more unresolved files)
27625
cdb9493a7e2f graft: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents: 27173
diff changeset
   482
  continue: hg graft --continue
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   483
  $ hg graft -c
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   484
  grafting 1:5d205f8b35b6 "1"
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   485
  $ hg export tip --git
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   486
  # HG changeset patch
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   487
  # User bar
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   488
  # Date 0 0
18648
76b69cccb07a export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents: 18631
diff changeset
   489
  #      Thu Jan 01 00:00:00 1970 +0000
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   490
  # Node ID f67661df0c4804d301f064f332b57e7d5ddaf2be
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   491
  # Parent  aaa4406d4f0ae9befd6e58c82ec63706460cbca6
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   492
  1
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   493
  
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   494
  diff --git a/a b/a
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   495
  --- a/a
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   496
  +++ b/a
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   497
  @@ -1,1 +1,1 @@
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   498
  -c
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   499
  +b
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   500
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   501
Resolve conflicted graft with rename
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   502
  $ echo c > a
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   503
  $ hg ci -m 10
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   504
  $ hg graft 2 --tool internal:fail
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   505
  grafting 2:5c095ad7e90f "2"
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   506
  abort: unresolved conflicts, can't continue
28963
fc1d75e7a98d graft: use single quotes around command hint
timeless <timeless@mozdev.org>
parents: 28634
diff changeset
   507
  (use 'hg resolve' and 'hg graft --continue')
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   508
  [255]
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   509
  $ hg resolve --all
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   510
  merging a and b to b
21947
b081decd9062 resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21765
diff changeset
   511
  (no more unresolved files)
27625
cdb9493a7e2f graft: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents: 27173
diff changeset
   512
  continue: hg graft --continue
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   513
  $ hg graft -c
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   514
  grafting 2:5c095ad7e90f "2"
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   515
  $ hg export tip --git
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   516
  # HG changeset patch
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   517
  # User test
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   518
  # Date 0 0
18648
76b69cccb07a export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents: 18631
diff changeset
   519
  #      Thu Jan 01 00:00:00 1970 +0000
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   520
  # Node ID 9627f653b421c61fc1ea4c4e366745070fa3d2bc
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   521
  # Parent  ee295f490a40b97f3d18dd4c4f1c8936c233b612
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   522
  2
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   523
  
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   524
  diff --git a/a b/b
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   525
  rename from a
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
   526
  rename to b
17185
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   527
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   528
Test simple origin(), with and without args
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   529
  $ hg log -r 'origin()'
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   530
  changeset:   1:5d205f8b35b6
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   531
  user:        bar
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   532
  date:        Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   533
  summary:     1
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   534
  
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   535
  changeset:   2:5c095ad7e90f
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   536
  user:        test
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   537
  date:        Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   538
  summary:     2
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   539
  
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   540
  changeset:   3:4c60f11aa304
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   541
  user:        baz
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   542
  date:        Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   543
  summary:     3
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   544
  
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   545
  changeset:   4:9c233e8e184d
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   546
  user:        test
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   547
  date:        Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   548
  summary:     4
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   549
  
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   550
  changeset:   5:97f8bfe72746
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   551
  branch:      stable
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   552
  parent:      3:4c60f11aa304
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   553
  user:        test
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   554
  date:        Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   555
  summary:     5
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   556
  
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   557
  $ hg log -r 'origin(7)'
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   558
  changeset:   2:5c095ad7e90f
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   559
  user:        test
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   560
  date:        Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   561
  summary:     2
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   562
  
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   563
Now transplant a graft to test following through copies
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   564
  $ hg up -q 0
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   565
  $ hg branch -q dev
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   566
  $ hg ci -qm "dev branch"
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   567
  $ hg --config extensions.transplant= transplant -q 7
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   568
  $ hg log -r 'origin(.)'
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   569
  changeset:   2:5c095ad7e90f
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   570
  user:        test
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   571
  date:        Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   572
  summary:     2
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
   573
  
21765
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   574
Test that the graft and transplant markers in extra are converted, allowing
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   575
origin() to still work.  Note that these recheck the immediately preceeding two
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   576
tests.
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   577
  $ hg --quiet --config extensions.convert= --config convert.hg.saverev=True convert . ../converted
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   578
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   579
The graft case
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   580
  $ hg -R ../converted log -r 7 --template "{rev}: {node}\n{join(extras, '\n')}\n"
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   581
  7: 7ae846e9111fc8f57745634250c7b9ac0a60689b
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   582
  branch=default
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   583
  convert_revision=ef0ef43d49e79e81ddafdc7997401ba0041efc82
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   584
  source=e0213322b2c1a5d5d236c74e79666441bee67a7d
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   585
  $ hg -R ../converted log -r 'origin(7)'
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   586
  changeset:   2:e0213322b2c1
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   587
  user:        test
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   588
  date:        Thu Jan 01 00:00:00 1970 +0000
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   589
  summary:     2
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   590
  
25589
273d94255e1e convert: update 'intermediate-source' in the destination's extras dictionary
Matt Harbison <matt_harbison@yahoo.com>
parents: 25125
diff changeset
   591
Test that template correctly expands more than one 'extra' (issue4362), and that
273d94255e1e convert: update 'intermediate-source' in the destination's extras dictionary
Matt Harbison <matt_harbison@yahoo.com>
parents: 25125
diff changeset
   592
'intermediate-source' is converted.
273d94255e1e convert: update 'intermediate-source' in the destination's extras dictionary
Matt Harbison <matt_harbison@yahoo.com>
parents: 25125
diff changeset
   593
  $ hg -R ../converted log -r 13 --template "{extras % ' Extra: {extra}\n'}"
23167
a3c2d9211294 templater: don't overwrite the keyword mapping in runsymbol() (issue4362)
Matt Harbison <matt_harbison@yahoo.com>
parents: 22897
diff changeset
   594
   Extra: branch=default
25589
273d94255e1e convert: update 'intermediate-source' in the destination's extras dictionary
Matt Harbison <matt_harbison@yahoo.com>
parents: 25125
diff changeset
   595
   Extra: convert_revision=7a4785234d87ec1aa420ed6b11afe40fa73e12a9
273d94255e1e convert: update 'intermediate-source' in the destination's extras dictionary
Matt Harbison <matt_harbison@yahoo.com>
parents: 25125
diff changeset
   596
   Extra: intermediate-source=7ae846e9111fc8f57745634250c7b9ac0a60689b
23167
a3c2d9211294 templater: don't overwrite the keyword mapping in runsymbol() (issue4362)
Matt Harbison <matt_harbison@yahoo.com>
parents: 22897
diff changeset
   597
   Extra: source=e0213322b2c1a5d5d236c74e79666441bee67a7d
a3c2d9211294 templater: don't overwrite the keyword mapping in runsymbol() (issue4362)
Matt Harbison <matt_harbison@yahoo.com>
parents: 22897
diff changeset
   598
21765
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   599
The transplant case
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   600
  $ hg -R ../converted log -r tip --template "{rev}: {node}\n{join(extras, '\n')}\n"
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   601
  21: fbb6c5cc81002f2b4b49c9d731404688bcae5ade
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   602
  branch=dev
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   603
  convert_revision=7e61b508e709a11d28194a5359bc3532d910af21
31452
52dabcc49968 templatekw: make join() escape values of extras (BC) (issue5504)
Yuya Nishihara <yuya@tcha.org>
parents: 30581
diff changeset
   604
  transplant_source=z\xe8F\xe9\x11\x1f\xc8\xf5wEcBP\xc7\xb9\xac\n`h\x9b
21765
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   605
  $ hg -R ../converted log -r 'origin(tip)'
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   606
  changeset:   2:e0213322b2c1
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   607
  user:        test
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   608
  date:        Thu Jan 01 00:00:00 1970 +0000
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   609
  summary:     2
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   610
  
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
   611
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   612
Test simple destination
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   613
  $ hg log -r 'destination()'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   614
  changeset:   7:ef0ef43d49e7
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   615
  parent:      0:68795b066622
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   616
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   617
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   618
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   619
  
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   620
  changeset:   8:6b9e5368ca4e
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   621
  user:        bar
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   622
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   623
  summary:     1
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   624
  
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   625
  changeset:   9:1905859650ec
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   626
  user:        test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   627
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   628
  summary:     5
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   629
  
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   630
  changeset:   10:52dc0b4c6907
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   631
  user:        test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   632
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   633
  summary:     4
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   634
  
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   635
  changeset:   11:882b35362a6b
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   636
  user:        test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   637
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   638
  summary:     3
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   639
  
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   640
  changeset:   13:7a4785234d87
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   641
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   642
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   643
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   644
  
30188
8a864844d5a0 checkcopies: add a sanity check against false-positive copies
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29975
diff changeset
   645
  changeset:   14:0c921c65ef1e
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   646
  parent:      1:5d205f8b35b6
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   647
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   648
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   649
  summary:     3
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   650
  
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   651
  changeset:   17:f67661df0c48
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   652
  user:        bar
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   653
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   654
  summary:     1
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   655
  
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   656
  changeset:   19:9627f653b421
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   657
  user:        test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   658
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   659
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   660
  
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   661
  changeset:   21:7e61b508e709
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   662
  branch:      dev
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   663
  tag:         tip
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   664
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   665
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   666
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   667
  
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   668
  $ hg log -r 'destination(2)'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   669
  changeset:   7:ef0ef43d49e7
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   670
  parent:      0:68795b066622
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   671
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   672
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   673
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   674
  
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   675
  changeset:   13:7a4785234d87
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   676
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   677
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   678
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   679
  
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   680
  changeset:   19:9627f653b421
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   681
  user:        test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   682
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   683
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   684
  
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   685
  changeset:   21:7e61b508e709
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   686
  branch:      dev
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   687
  tag:         tip
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   688
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   689
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   690
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   691
  
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   692
Transplants of grafts can find a destination...
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   693
  $ hg log -r 'destination(7)'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   694
  changeset:   21:7e61b508e709
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   695
  branch:      dev
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   696
  tag:         tip
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   697
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   698
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   699
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   700
  
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   701
... grafts of grafts unfortunately can't
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   702
  $ hg graft -q 13
23929
a43fdf33a6be commit: remove reverse search for copy source when not in parent (issue4476)
Ryan McElroy <rmcelroy@fb.com>
parents: 23917
diff changeset
   703
  warning: can't find ancestor for 'b' copied from 'a'!
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   704
  $ hg log -r 'destination(13)'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   705
All copies of a cset
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   706
  $ hg log -r 'origin(13) or destination(origin(13))'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   707
  changeset:   2:5c095ad7e90f
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   708
  user:        test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   709
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   710
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   711
  
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   712
  changeset:   7:ef0ef43d49e7
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   713
  parent:      0:68795b066622
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   714
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   715
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   716
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   717
  
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   718
  changeset:   13:7a4785234d87
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   719
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   720
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   721
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   722
  
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   723
  changeset:   19:9627f653b421
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   724
  user:        test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   725
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   726
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   727
  
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   728
  changeset:   21:7e61b508e709
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   729
  branch:      dev
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   730
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   731
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   732
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   733
  
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   734
  changeset:   22:d1cb6591fa4b
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   735
  branch:      dev
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   736
  tag:         tip
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   737
  user:        foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   738
  date:        Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   739
  summary:     2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
   740
  
21200
a1381eea7c7d graft: do not use `.remove` on a smart set (regression)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21082
diff changeset
   741
a1381eea7c7d graft: do not use `.remove` on a smart set (regression)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21082
diff changeset
   742
graft works on complex revset
a1381eea7c7d graft: do not use `.remove` on a smart set (regression)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21082
diff changeset
   743
a1381eea7c7d graft: do not use `.remove` on a smart set (regression)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21082
diff changeset
   744
  $ hg graft 'origin(13) or destination(origin(13))'
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
   745
  skipping ancestor revision 21:7e61b508e709
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   746
  skipping ancestor revision 22:d1cb6591fa4b
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   747
  skipping revision 2:5c095ad7e90f (already grafted to 22:d1cb6591fa4b)
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   748
  grafting 7:ef0ef43d49e7 "2"
23929
a43fdf33a6be commit: remove reverse search for copy source when not in parent (issue4476)
Ryan McElroy <rmcelroy@fb.com>
parents: 23917
diff changeset
   749
  warning: can't find ancestor for 'b' copied from 'a'!
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   750
  grafting 13:7a4785234d87 "2"
23929
a43fdf33a6be commit: remove reverse search for copy source when not in parent (issue4476)
Ryan McElroy <rmcelroy@fb.com>
parents: 23917
diff changeset
   751
  warning: can't find ancestor for 'b' copied from 'a'!
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   752
  grafting 19:9627f653b421 "2"
21200
a1381eea7c7d graft: do not use `.remove` on a smart set (regression)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21082
diff changeset
   753
  merging b
23929
a43fdf33a6be commit: remove reverse search for copy source when not in parent (issue4476)
Ryan McElroy <rmcelroy@fb.com>
parents: 23917
diff changeset
   754
  warning: can't find ancestor for 'b' copied from 'a'!
22302
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
   755
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   756
graft with --force (still doesn't graft merges)
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   757
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   758
  $ hg graft 19 0 6
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   759
  skipping ungraftable merge revision 6
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
   760
  skipping ancestor revision 0:68795b066622
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   761
  skipping already grafted revision 19:9627f653b421 (22:d1cb6591fa4b also has origin 2:5c095ad7e90f)
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   762
  [255]
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   763
  $ hg graft 19 0 6 --force
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   764
  skipping ungraftable merge revision 6
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   765
  grafting 19:9627f653b421 "2"
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   766
  merging b
23929
a43fdf33a6be commit: remove reverse search for copy source when not in parent (issue4476)
Ryan McElroy <rmcelroy@fb.com>
parents: 23917
diff changeset
   767
  warning: can't find ancestor for 'b' copied from 'a'!
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
   768
  grafting 0:68795b066622 "0"
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   769
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   770
graft --force after backout
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   771
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   772
  $ echo abc > a
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   773
  $ hg ci -m 28
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   774
  $ hg backout 28
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   775
  reverting a
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   776
  changeset 29:53177ba928f6 backs out changeset 28:50a516bb8b57
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   777
  $ hg graft 28
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   778
  skipping ancestor revision 28:50a516bb8b57
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   779
  [255]
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   780
  $ hg graft 28 --force
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   781
  grafting 28:50a516bb8b57 "28"
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   782
  merging a
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   783
  $ cat a
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   784
  abc
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
   785
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
   786
graft --continue after --force
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
   787
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   788
  $ echo def > a
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   789
  $ hg ci -m 31
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
   790
  $ hg graft 28 --force --tool internal:fail
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   791
  grafting 28:50a516bb8b57 "28"
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
   792
  abort: unresolved conflicts, can't continue
28963
fc1d75e7a98d graft: use single quotes around command hint
timeless <timeless@mozdev.org>
parents: 28634
diff changeset
   793
  (use 'hg resolve' and 'hg graft --continue')
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
   794
  [255]
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
   795
  $ hg resolve --all
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
   796
  merging a
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
   797
  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   798
  [1]
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   799
  $ echo abc > a
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
   800
  $ hg resolve -m a
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
   801
  (no more unresolved files)
27625
cdb9493a7e2f graft: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents: 27173
diff changeset
   802
  continue: hg graft --continue
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
   803
  $ hg graft -c
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   804
  grafting 28:50a516bb8b57 "28"
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
   805
  $ cat a
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
   806
  abc
22302
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
   807
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
   808
Continue testing same origin policy, using revision numbers from test above
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
   809
but do some destructive editing of the repo:
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
   810
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
   811
  $ hg up -qC 7
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
   812
  $ hg tag -l -r 13 tmp
23514
3575f42e1b7b test-graft: use strip extension instead of mq extension
Augie Fackler <raf@durin42.com>
parents: 23508
diff changeset
   813
  $ hg --config extensions.strip= strip 2
35393
4441705b7111 tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents: 33771
diff changeset
   814
  saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg
22302
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
   815
  $ hg graft tmp
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   816
  skipping already grafted revision 8:7a4785234d87 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f)
22302
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
   817
  [255]
23504
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
   818
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
   819
Empty graft
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
   820
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
   821
  $ hg up -qr 26
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
   822
  $ hg tag -f something
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
   823
  $ hg graft -qr 27
23508
2164226a5637 graft: drop cset description from empty commit message
Matt Mackall <mpm@selenic.com>
parents: 23507
diff changeset
   824
  $ hg graft -f 27
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   825
  grafting 27:ed6c7e54e319 "28"
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   826
  note: graft of 27:ed6c7e54e319 created no changes to commit
24643
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   827
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   828
  $ cd ..
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   829
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   830
Graft to duplicate a commit
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   831
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   832
  $ hg init graftsibling
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   833
  $ cd graftsibling
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   834
  $ touch a
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   835
  $ hg commit -qAm a
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   836
  $ touch b
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   837
  $ hg commit -qAm b
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   838
  $ hg log -G -T '{rev}\n'
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   839
  @  1
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   840
  |
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   841
  o  0
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   842
  
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   843
  $ hg up -q 0
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   844
  $ hg graft -r 1
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   845
  grafting 1:0e067c57feba "b" (tip)
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   846
  $ hg log -G -T '{rev}\n'
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   847
  @  2
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   848
  |
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   849
  | o  1
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   850
  |/
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   851
  o  0
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
   852
  
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   853
Graft to duplicate a commit twice
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   854
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   855
  $ hg up -q 0
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   856
  $ hg graft -r 2
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   857
  grafting 2:044ec77f6389 "b" (tip)
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   858
  $ hg log -G -T '{rev}\n'
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   859
  @  3
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   860
  |
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   861
  | o  2
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   862
  |/
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   863
  | o  1
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   864
  |/
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   865
  o  0
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
   866
  
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   867
Graft from behind a move or rename
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   868
==================================
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   869
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   870
NOTE: This is affected by issue5343, and will need updating when it's fixed
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   871
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   872
Possible cases during a regular graft (when ca is between cta and c2):
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   873
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   874
name | c1<-cta | cta<->ca | ca->c2
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   875
A.0  |         |          |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   876
A.1  |    X    |          |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   877
A.2  |         |     X    |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   878
A.3  |         |          |   X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   879
A.4  |    X    |     X    |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   880
A.5  |    X    |          |   X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   881
A.6  |         |     X    |   X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   882
A.7  |    X    |     X    |   X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   883
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   884
A.0 is trivial, and doesn't need copy tracking.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   885
For A.1, a forward rename is recorded in the c1 pass, to be followed later.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   886
In A.2, the rename is recorded in the c2 pass and followed backwards.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   887
A.3 is recorded in the c2 pass as a forward rename to be duplicated on target.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   888
In A.4, both passes of checkcopies record incomplete renames, which are
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   889
then joined in mergecopies to record a rename to be followed.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   890
In A.5 and A.7, the c1 pass records an incomplete rename, while the c2 pass
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   891
records an incomplete divergence. The incomplete rename is then joined to the
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   892
appropriate side of the incomplete divergence, and the result is recorded as a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   893
divergence. The code doesn't distinguish at all between these two cases, since
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   894
the end result of them is the same: an incomplete divergence joined with an
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   895
incomplete rename into a divergence.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   896
Finally, A.6 records a divergence entirely in the c2 pass.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   897
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   898
A.4 has a degenerate case a<-b<-a->a, where checkcopies isn't needed at all.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   899
A.5 has a special case a<-b<-b->a, which is treated like a<-b->a in a merge.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   900
A.6 has a special case a<-a<-b->a. Here, checkcopies will find a spurious
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   901
incomplete divergence, which is in fact complete. This is handled later in
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   902
mergecopies.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   903
A.7 has 4 special cases: a<-b<-a->b (the "ping-pong" case), a<-b<-c->b,
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   904
a<-b<-a->c and a<-b<-c->a. Of these, only the "ping-pong" case is interesting,
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   905
the others are fairly trivial (a<-b<-c->b and a<-b<-a->c proceed like the base
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   906
case, a<-b<-c->a is treated the same as a<-b<-b->a).
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   907
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   908
f5a therefore tests the "ping-pong" rename case, where a file is renamed to the
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   909
same name on both branches, then the rename is backed out on one branch, and
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   910
the backout is grafted to the other branch. This creates a challenging rename
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   911
sequence of a<-b<-a->b in the graft target, topological CA, graft CA and graft
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   912
source, respectively. Since rename detection will run on the c1 side for such a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   913
sequence (as for technical reasons, we split the c1 and c2 sides not at the
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   914
graft CA, but rather at the topological CA), it will pick up a false rename,
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   915
and cause a spurious merge conflict. This false rename is always exactly the
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   916
reverse of the true rename that would be detected on the c2 side, so we can
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   917
correct for it by detecting this condition and reversing as necessary.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   918
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   919
First, set up the repository with commits to be grafted
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   920
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   921
  $ hg init ../graftmove
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   922
  $ cd ../graftmove
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   923
  $ echo c1a > f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   924
  $ echo c2a > f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   925
  $ echo c3a > f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   926
  $ echo c4a > f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   927
  $ echo c5a > f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   928
  $ hg ci -qAm A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   929
  $ hg mv f1a f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   930
  $ hg mv f3a f3b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   931
  $ hg mv f5a f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   932
  $ hg ci -qAm B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   933
  $ echo c1c > f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   934
  $ hg mv f2a f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   935
  $ hg mv f5b f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   936
  $ echo c5c > f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   937
  $ hg ci -qAm C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   938
  $ hg mv f3b f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   939
  $ echo c4d > f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   940
  $ hg ci -qAm D0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   941
  $ hg log -G
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   942
  @  changeset:   3:b69f5839d2d9
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   943
  |  tag:         tip
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   944
  |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   945
  |  date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   946
  |  summary:     D0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   947
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   948
  o  changeset:   2:f58c7e2b28fa
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   949
  |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   950
  |  date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   951
  |  summary:     C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   952
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   953
  o  changeset:   1:3d7bba921b5d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   954
  |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   955
  |  date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   956
  |  summary:     B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   957
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   958
  o  changeset:   0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   959
     user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   960
     date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   961
     summary:     A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   962
  
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   963
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   964
Test the cases A.2 (f1x), A.3 (f2x) and a special case of A.6 (f5x) where the
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   965
two renames actually converge to the same name (thus no actual divergence).
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   966
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   967
  $ hg up -q 'desc("A0")'
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   968
  $ HGEDITOR="echo C1 >" hg graft -r 'desc("C0")' --edit
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   969
  grafting 2:f58c7e2b28fa "C0"
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
   970
  merging f1a and f1b to f1a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   971
  merging f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   972
  warning: can't find ancestor for 'f5a' copied from 'f5b'!
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   973
  $ hg status --change .
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
   974
  M f1a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   975
  M f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   976
  A f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   977
  R f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   978
  $ hg cat f1a
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
   979
  c1c
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   980
  $ hg cat f1b
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
   981
  f1b: no such file in rev c9763722f9bd
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
   982
  [1]
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   983
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   984
Test the cases A.0 (f4x) and A.6 (f3x)
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   985
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   986
  $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   987
  grafting 3:b69f5839d2d9 "D0"
30201
856ead835f56 checkcopies: handle divergences contained entirely in tca::ctx
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30197
diff changeset
   988
  note: possible conflict - f3b was renamed multiple times to:
856ead835f56 checkcopies: handle divergences contained entirely in tca::ctx
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30197
diff changeset
   989
   f3d
856ead835f56 checkcopies: handle divergences contained entirely in tca::ctx
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30197
diff changeset
   990
   f3a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   991
  warning: can't find ancestor for 'f3d' copied from 'f3b'!
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   992
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   993
Set up the repository for some further tests
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   994
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   995
  $ hg up -q "min(desc("A0"))"
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   996
  $ hg mv f1a f1e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   997
  $ echo c2e > f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   998
  $ hg mv f3a f3e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
   999
  $ hg mv f4a f4e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1000
  $ hg mv f5a f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1001
  $ hg ci -qAm "E0"
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1002
  $ hg log -G
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1003
  @  changeset:   6:6bd1736cab86
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1004
  |  tag:         tip
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1005
  |  parent:      0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1006
  |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1007
  |  date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1008
  |  summary:     E0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1009
  |
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1010
  | o  changeset:   5:560daee679da
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1011
  | |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1012
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1013
  | |  summary:     D1
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1014
  | |
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1015
  | o  changeset:   4:c9763722f9bd
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1016
  |/   parent:      0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1017
  |    user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1018
  |    date:        Thu Jan 01 00:00:00 1970 +0000
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1019
  |    summary:     C1
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1020
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1021
  | o  changeset:   3:b69f5839d2d9
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1022
  | |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1023
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1024
  | |  summary:     D0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1025
  | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1026
  | o  changeset:   2:f58c7e2b28fa
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1027
  | |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1028
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1029
  | |  summary:     C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1030
  | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1031
  | o  changeset:   1:3d7bba921b5d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1032
  |/   user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1033
  |    date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1034
  |    summary:     B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1035
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1036
  o  changeset:   0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1037
     user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1038
     date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1039
     summary:     A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1040
  
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1041
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1042
Test the cases A.4 (f1x), the "ping-pong" special case of A.7 (f5x),
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1043
and A.3 with a local content change to be preserved (f2x).
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1044
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1045
  $ HGEDITOR="echo C2 >" hg graft -r 'desc("C0")' --edit
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1046
  grafting 2:f58c7e2b28fa "C0"
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1047
  merging f1e and f1b to f1e
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1048
  merging f2a and f2c to f2c
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1049
  merging f5b and f5a to f5a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1050
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1051
Test the cases A.1 (f4x) and A.7 (f3x).
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1052
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1053
  $ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1054
  grafting 3:b69f5839d2d9 "D0"
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1055
  note: possible conflict - f3b was renamed multiple times to:
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1056
   f3e
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1057
   f3d
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1058
  merging f4e and f4a to f4e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1059
  warning: can't find ancestor for 'f3d' copied from 'f3b'!
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1060
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1061
Check the results of the grafts tested
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1062
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1063
  $ hg log -CGv --patch --git
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1064
  @  changeset:   8:93ee502e8b0a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1065
  |  tag:         tip
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1066
  |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1067
  |  date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1068
  |  files:       f3d f4e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1069
  |  description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1070
  |  D2
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1071
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1072
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1073
  |  diff --git a/f3d b/f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1074
  |  new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1075
  |  --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1076
  |  +++ b/f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1077
  |  @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1078
  |  +c3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1079
  |  diff --git a/f4e b/f4e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1080
  |  --- a/f4e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1081
  |  +++ b/f4e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1082
  |  @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1083
  |  -c4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1084
  |  +c4d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1085
  |
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1086
  o  changeset:   7:539cf145f496
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1087
  |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1088
  |  date:        Thu Jan 01 00:00:00 1970 +0000
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1089
  |  files:       f1e f2a f2c f5a f5b
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1090
  |  copies:      f2c (f2a) f5a (f5b)
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1091
  |  description:
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1092
  |  C2
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1093
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1094
  |
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1095
  |  diff --git a/f1e b/f1e
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1096
  |  --- a/f1e
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1097
  |  +++ b/f1e
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1098
  |  @@ -1,1 +1,1 @@
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1099
  |  -c1a
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1100
  |  +c1c
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1101
  |  diff --git a/f2a b/f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1102
  |  rename from f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1103
  |  rename to f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1104
  |  diff --git a/f5b b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1105
  |  rename from f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1106
  |  rename to f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1107
  |  --- a/f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1108
  |  +++ b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1109
  |  @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1110
  |  -c5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1111
  |  +c5c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1112
  |
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1113
  o  changeset:   6:6bd1736cab86
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1114
  |  parent:      0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1115
  |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1116
  |  date:        Thu Jan 01 00:00:00 1970 +0000
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1117
  |  files:       f1a f1e f2a f3a f3e f4a f4e f5a f5b
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1118
  |  copies:      f1e (f1a) f3e (f3a) f4e (f4a) f5b (f5a)
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1119
  |  description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1120
  |  E0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1121
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1122
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1123
  |  diff --git a/f1a b/f1e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1124
  |  rename from f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1125
  |  rename to f1e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1126
  |  diff --git a/f2a b/f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1127
  |  --- a/f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1128
  |  +++ b/f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1129
  |  @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1130
  |  -c2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1131
  |  +c2e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1132
  |  diff --git a/f3a b/f3e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1133
  |  rename from f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1134
  |  rename to f3e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1135
  |  diff --git a/f4a b/f4e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1136
  |  rename from f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1137
  |  rename to f4e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1138
  |  diff --git a/f5a b/f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1139
  |  rename from f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1140
  |  rename to f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1141
  |
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1142
  | o  changeset:   5:560daee679da
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1143
  | |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1144
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1145
  | |  files:       f3d f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1146
  | |  description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1147
  | |  D1
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1148
  | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1149
  | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1150
  | |  diff --git a/f3d b/f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1151
  | |  new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1152
  | |  --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1153
  | |  +++ b/f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1154
  | |  @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1155
  | |  +c3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1156
  | |  diff --git a/f4a b/f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1157
  | |  --- a/f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1158
  | |  +++ b/f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1159
  | |  @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1160
  | |  -c4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1161
  | |  +c4d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1162
  | |
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1163
  | o  changeset:   4:c9763722f9bd
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1164
  |/   parent:      0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1165
  |    user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1166
  |    date:        Thu Jan 01 00:00:00 1970 +0000
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1167
  |    files:       f1a f2a f2c f5a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1168
  |    copies:      f2c (f2a)
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1169
  |    description:
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
  1170
  |    C1
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1171
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1172
  |
30197
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1173
  |    diff --git a/f1a b/f1a
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1174
  |    --- a/f1a
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1175
  |    +++ b/f1a
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1176
  |    @@ -1,1 +1,1 @@
0accd5a5ad04 mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30192
diff changeset
  1177
  |    -c1a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1178
  |    +c1c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1179
  |    diff --git a/f2a b/f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1180
  |    rename from f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1181
  |    rename to f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1182
  |    diff --git a/f5a b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1183
  |    --- a/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1184
  |    +++ b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1185
  |    @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1186
  |    -c5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1187
  |    +c5c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1188
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1189
  | o  changeset:   3:b69f5839d2d9
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1190
  | |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1191
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1192
  | |  files:       f3b f3d f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1193
  | |  copies:      f3d (f3b)
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1194
  | |  description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1195
  | |  D0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1196
  | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1197
  | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1198
  | |  diff --git a/f3b b/f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1199
  | |  rename from f3b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1200
  | |  rename to f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1201
  | |  diff --git a/f4a b/f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1202
  | |  --- a/f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1203
  | |  +++ b/f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1204
  | |  @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1205
  | |  -c4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1206
  | |  +c4d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1207
  | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1208
  | o  changeset:   2:f58c7e2b28fa
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1209
  | |  user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1210
  | |  date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1211
  | |  files:       f1b f2a f2c f5a f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1212
  | |  copies:      f2c (f2a) f5a (f5b)
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1213
  | |  description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1214
  | |  C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1215
  | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1216
  | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1217
  | |  diff --git a/f1b b/f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1218
  | |  --- a/f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1219
  | |  +++ b/f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1220
  | |  @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1221
  | |  -c1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1222
  | |  +c1c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1223
  | |  diff --git a/f2a b/f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1224
  | |  rename from f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1225
  | |  rename to f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1226
  | |  diff --git a/f5b b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1227
  | |  rename from f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1228
  | |  rename to f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1229
  | |  --- a/f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1230
  | |  +++ b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1231
  | |  @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1232
  | |  -c5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1233
  | |  +c5c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1234
  | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1235
  | o  changeset:   1:3d7bba921b5d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1236
  |/   user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1237
  |    date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1238
  |    files:       f1a f1b f3a f3b f5a f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1239
  |    copies:      f1b (f1a) f3b (f3a) f5b (f5a)
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1240
  |    description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1241
  |    B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1242
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1243
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1244
  |    diff --git a/f1a b/f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1245
  |    rename from f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1246
  |    rename to f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1247
  |    diff --git a/f3a b/f3b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1248
  |    rename from f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1249
  |    rename to f3b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1250
  |    diff --git a/f5a b/f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1251
  |    rename from f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1252
  |    rename to f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1253
  |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1254
  o  changeset:   0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1255
     user:        test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1256
     date:        Thu Jan 01 00:00:00 1970 +0000
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1257
     files:       f1a f2a f3a f4a f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1258
     description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1259
     A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1260
  
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1261
  
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1262
     diff --git a/f1a b/f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1263
     new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1264
     --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1265
     +++ b/f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1266
     @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1267
     +c1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1268
     diff --git a/f2a b/f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1269
     new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1270
     --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1271
     +++ b/f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1272
     @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1273
     +c2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1274
     diff --git a/f3a b/f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1275
     new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1276
     --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1277
     +++ b/f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1278
     @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1279
     +c3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1280
     diff --git a/f4a b/f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1281
     new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1282
     --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1283
     +++ b/f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1284
     @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1285
     +c4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1286
     diff --git a/f5a b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1287
     new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1288
     --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1289
     +++ b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1290
     @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1291
     +c5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1292
  
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1293
  $ hg cat f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
  1294
  c2e
30229
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1295
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1296
Check superfluous filemerge of files renamed in the past but untouched by graft
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1297
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1298
  $ echo a > a
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1299
  $ hg ci -qAma
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1300
  $ hg mv a b
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1301
  $ echo b > b
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1302
  $ hg ci -qAmb
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1303
  $ echo c > c
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1304
  $ hg ci -qAmc
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1305
  $ hg up -q .~2
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
  1306
  $ hg graft tip -qt:fail
30581
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1307
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1308
  $ cd ..
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1309
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1310
Graft a change into a new file previously grafted into a renamed directory
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1311
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1312
  $ hg init dirmovenewfile
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1313
  $ cd dirmovenewfile
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1314
  $ mkdir a
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1315
  $ echo a > a/a
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1316
  $ hg ci -qAma
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1317
  $ echo x > a/x
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1318
  $ hg ci -qAmx
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1319
  $ hg up -q 0
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1320
  $ hg mv -q a b
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1321
  $ hg ci -qAmb
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1322
  $ hg graft -q 1 # a/x grafted as b/x, but no copy information recorded
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1323
  $ hg up -q 1
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1324
  $ echo y > a/x
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1325
  $ hg ci -qAmy
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1326
  $ hg up -q 3
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1327
  $ hg graft -q 4
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1328
  $ hg status --change .
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1329
  M b/x
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1330
32204
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1331
Prepare for test of skipped changesets and how merges can influence it:
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1332
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1333
  $ hg merge -q -r 1 --tool :local
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1334
  $ hg ci -m m
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1335
  $ echo xx >> b/x
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1336
  $ hg ci -m xx
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1337
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1338
  $ hg log -G -T '{rev} {desc|firstline}'
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1339
  @  7 xx
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1340
  |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1341
  o    6 m
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1342
  |\
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1343
  | o  5 y
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1344
  | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1345
  +---o  4 y
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1346
  | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1347
  | o  3 x
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1348
  | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1349
  | o  2 b
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1350
  | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1351
  o |  1 x
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1352
  |/
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1353
  o  0 a
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1354
  
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1355
Grafting of plain changes correctly detects that 3 and 5 should be skipped:
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1356
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1357
  $ hg up -qCr 4
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1358
  $ hg graft --tool :local -r 2::5
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1359
  skipping already grafted revision 3:ca093ca2f1d9 (was grafted from 1:13ec5badbf2a)
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1360
  skipping already grafted revision 5:43e9eb70dab0 (was grafted from 4:6c9a1289e5f1)
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1361
  grafting 2:42127f193bcd "b"
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1362
32205
b4e1e30528c7 graft: fix graft across merges of duplicates of grafted changes
Mads Kiilerich <madski@unity3d.com>
parents: 32204
diff changeset
  1363
Extending the graft range to include a (skipped) merge of 3 will not prevent us from
b4e1e30528c7 graft: fix graft across merges of duplicates of grafted changes
Mads Kiilerich <madski@unity3d.com>
parents: 32204
diff changeset
  1364
also detecting that both 3 and 5 should be skipped:
32204
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1365
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1366
  $ hg up -qCr 4
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1367
  $ hg graft --tool :local -r 2::7
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1368
  skipping ungraftable merge revision 6
32205
b4e1e30528c7 graft: fix graft across merges of duplicates of grafted changes
Mads Kiilerich <madski@unity3d.com>
parents: 32204
diff changeset
  1369
  skipping already grafted revision 3:ca093ca2f1d9 (was grafted from 1:13ec5badbf2a)
32204
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1370
  skipping already grafted revision 5:43e9eb70dab0 (was grafted from 4:6c9a1289e5f1)
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1371
  grafting 2:42127f193bcd "b"
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1372
  grafting 7:d3c3f2b38ecc "xx"
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1373
  note: graft of 7:d3c3f2b38ecc created no changes to commit
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
  1374
30581
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
  1375
  $ cd ..
38149
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1376
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1377
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
  1378
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1379
  $ hg init oldgraft
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1380
  $ cd oldgraft
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1381
  $ 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
  1382
  $ 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
  1383
  @  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
  1384
  |
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1385
  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
  1386
  |
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1387
  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
  1388
  
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1389
  $ hg up 0
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1390
  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
  1391
  $ echo bar > b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1392
  $ hg add b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1393
  $ 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
  1394
  created new head
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1395
  $ 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
  1396
  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
  1397
  merging b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1398
  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
  1399
  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
  1400
  (use 'hg resolve' and 'hg graft --continue')
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1401
  [255]
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1402
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1403
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
  1404
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1405
  $ 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
  1406
  $ echo foo > b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1407
  $ hg resolve -m
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1408
  (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
  1409
  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
  1410
  $ hg graft --continue
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
  1411
  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
  1412
  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
  1413
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1414
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
  1415
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
  1416
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1417
  $ hg log -G
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1418
  @  changeset:   5:711e9fa999f1
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1419
  |  tag:         tip
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1420
  |  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1421
  |  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
  1422
  |  summary:     added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1423
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1424
  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
  1425
  |  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1426
  |  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
  1427
  |  summary:     added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1428
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1429
  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
  1430
  |  parent:      0:f7ad41964313
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1431
  |  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1432
  |  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
  1433
  |  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
  1434
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1435
  | 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
  1436
  | |  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1437
  | |  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
  1438
  | |  summary:     added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1439
  | |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1440
  | 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
  1441
  |/   user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1442
  |    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
  1443
  |    summary:     added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1444
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1445
  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
  1446
     user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1447
     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
  1448
     summary:     added a
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1449
  
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1450
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1451
  $ hg up '.^^'
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1452
  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
  1453
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1454
  $ 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
  1455
  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
  1456
  merging b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1457
  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
  1458
  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
  1459
  (use 'hg resolve' and 'hg graft --continue')
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1460
  [255]
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1461
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1462
  $ echo wat > b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1463
  $ hg resolve -m
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1464
  (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
  1465
  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
  1466
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1467
  $ hg graft --continue
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1468
  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
  1469
  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
  1470
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1471
  $ 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
  1472
  @  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
  1473
  |  tag:         tip
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
  1474
  |  user:        batman
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1475
  |  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
  1476
  |  summary:     added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1477
  |
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
  1478
  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
  1479
  |  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
  1480
  |  user:        batman
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1481
  |  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
  1482
  |  summary:     added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1483
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1484
  | 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
  1485
  | |  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1486
  | |  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
  1487
  | |  summary:     added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1488
  | |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1489
  | 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
  1490
  |/   user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1491
  |    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
  1492
  |    summary:     added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1493
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1494
  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
  1495
  |  parent:      0:f7ad41964313
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1496
  ~  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1497
     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
  1498
     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
  1499
  
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1500
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
  1501
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1502
  $ hg up '.^^'
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1503
  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
  1504
  $ 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
  1505
  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
  1506
  merging b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1507
  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
  1508
  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
  1509
  (use 'hg resolve' and 'hg graft --continue')
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1510
  [255]
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1511
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1512
  $ echo foobar > b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1513
  $ hg resolve -m
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1514
  (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
  1515
  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
  1516
  $ hg graft --continue
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1517
  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
  1518
  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
  1519
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1520
  $ 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
  1521
  @  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
  1522
  |  tag:         tip
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1523
  |  user:        test
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
  1524
  |  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
  1525
  |  summary:     added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1526
  |
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
  1527
  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
  1528
  |  parent:      3:9e887f7a939c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1529
  |  user:        test
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
  1530
  |  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
  1531
  |  summary:     added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1532
  |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1533
  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
  1534
  |  parent:      0:f7ad41964313
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1535
  ~  user:        test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
  1536
     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
  1537
     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
  1538
  
38237
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1539
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
  1540
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1541
  $ hg up '.^^'
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1542
  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
  1543
  $ 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
  1544
  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
  1545
  merging b
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1546
  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
  1547
  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
  1548
  (use 'hg resolve' and 'hg graft --continue')
38237
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1549
  [255]
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1550
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1551
  $ echo foobar > b
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1552
  $ hg resolve -m
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1553
  (no more unresolved files)
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1554
  continue: hg graft --continue
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1555
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1556
  $ hg graft --continue
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1557
  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
  1558
  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
  1559
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1560
  $ 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
  1561
  @  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
  1562
  |  (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
  1563
  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
  1564
  |  (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6)
38237
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1565
  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
  1566
  |
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
  1567
  ~
38280
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1568
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1569
  $ cd ..
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1570
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1571
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
  1572
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1573
  $ hg init stopgraft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1574
  $ cd stopgraft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1575
  $ 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
  1576
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1577
  $ hg log -G
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1578
  @  changeset:   3:9150fe93bec6
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1579
  |  tag:         tip
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1580
  |  user:        test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1581
  |  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
  1582
  |  summary:     added d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1583
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1584
  o  changeset:   2:155349b645be
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1585
  |  user:        test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1586
  |  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
  1587
  |  summary:     added c
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1588
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1589
  o  changeset:   1:5f6d8a4bf34a
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1590
  |  user:        test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1591
  |  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
  1592
  |  summary:     added b
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1593
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1594
  o  changeset:   0:9092f1db7931
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1595
     user:        test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1596
     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
  1597
     summary:     added a
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1598
  
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1599
  $ hg up '.^^'
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1600
  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
  1601
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1602
  $ echo foo > d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1603
  $ 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
  1604
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1605
  $ hg graft --stop
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1606
  abort: no interrupted graft found
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1607
  [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1608
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1609
  $ hg graft -r 3
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1610
  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
  1611
  merging d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1612
  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
  1613
  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
  1614
  (use 'hg resolve' and 'hg graft --continue')
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1615
  [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1616
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1617
  $ hg graft --stop --continue
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1618
  abort: cannot use '--continue' and '--stop' together
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1619
  [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1620
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1621
  $ hg graft --stop -U
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1622
  abort: cannot specify any other flag with '--stop'
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1623
  [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1624
  $ hg graft --stop --rev 4
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1625
  abort: cannot specify any other flag with '--stop'
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1626
  [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1627
  $ hg graft --stop --log
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1628
  abort: cannot specify any other flag with '--stop'
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1629
  [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1630
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1631
  $ hg graft --stop
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1632
  stopped the interrupted graft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1633
  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
  1634
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1635
  $ hg diff
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1636
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1637
  $ hg log -Gr '.'
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1638
  @  changeset:   4:a0deacecd59d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1639
  |  tag:         tip
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1640
  ~  parent:      1:5f6d8a4bf34a
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1641
     user:        test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1642
     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
  1643
     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
  1644
  
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1645
  $ 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
  1646
  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
  1647
  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
  1648
  merging d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1649
  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
  1650
  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
  1651
  (use 'hg resolve' and 'hg graft --continue')
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1652
  [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1653
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1654
  $ hg graft --stop
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1655
  stopped the interrupted graft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1656
  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
  1657
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1658
  $ hg diff
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1659
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1660
  $ 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
  1661
  @  5:75b447541a9e added c
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1662
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1663
  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
  1664
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1665
  | 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
  1666
  | |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1667
  | 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
  1668
  |/
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1669
  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
  1670
  |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
  1671
  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
  1672
  
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1673
  $ cd ..
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1674
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1675
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
  1676
before the graft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1677
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1678
  $ hg init abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1679
  $ cd abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1680
  $ 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
  1681
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1682
  $ hg up '.^^'
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1683
  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
  1684
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1685
  $ echo x > x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1686
  $ hg ci -Aqm "added x"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1687
  $ hg up '.^'
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1688
  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
  1689
  $ echo foo > c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1690
  $ 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
  1691
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1692
  $ 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
  1693
  @  5:36b793615f78 added foo to c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1694
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1695
  | o  4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1696
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1697
  | o  3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1698
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1699
  | o  2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1700
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1701
  o  1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1702
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1703
  o  0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1704
  
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1705
  $ hg up 9150fe93bec6
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1706
  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
  1707
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1708
  $ hg graft --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1709
  abort: no interrupted graft to abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1710
  [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1711
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1712
when stripping is required
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1713
  $ hg graft -r 4 -r 5
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1714
  grafting 4:863a25e1a9ea "added x"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1715
  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
  1716
  merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1717
  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
  1718
  abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1719
  (use 'hg resolve' and 'hg graft --continue')
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1720
  [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1721
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1722
  $ hg graft --continue --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1723
  abort: cannot use '--continue' and '--abort' together
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1724
  [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1725
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1726
  $ hg graft --abort --stop
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1727
  abort: cannot use '--abort' and '--stop' together
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1728
  [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1729
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1730
  $ hg graft --abort --currentuser
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1731
  abort: cannot specify any other flag with '--abort'
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1732
  [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1733
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1734
  $ hg graft --abort --edit
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1735
  abort: cannot specify any other flag with '--abort'
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1736
  [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1737
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1738
  $ hg graft --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1739
  graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1740
  working directory is now at 9150fe93bec6
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1741
  $ 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
  1742
  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
  1743
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1744
  | o  4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1745
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1746
  | @  3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1747
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1748
  | o  2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1749
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1750
  o  1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1751
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1752
  o  0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1753
  
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1754
when stripping is not required
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1755
  $ hg graft -r 5
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1756
  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
  1757
  merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1758
  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
  1759
  abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1760
  (use 'hg resolve' and 'hg graft --continue')
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1761
  [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1762
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1763
  $ hg graft --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1764
  graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1765
  working directory is now at 9150fe93bec6
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1766
  $ 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
  1767
  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
  1768
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1769
  | o  4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1770
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1771
  | @  3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1772
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1773
  | o  2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1774
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1775
  o  1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1776
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1777
  o  0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1778
  
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1779
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
  1780
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1781
  $ hg graft -r 4 -r 5
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1782
  grafting 4:863a25e1a9ea "added x"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1783
  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
  1784
  merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1785
  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
  1786
  abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1787
  (use 'hg resolve' and 'hg graft --continue')
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1788
  [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1789
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1790
  $ 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
  1791
  @  6:6ec71c037d94 added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1792
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1793
  | 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
  1794
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1795
  | | o  4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1796
  | |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1797
  o |  3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1798
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1799
  o |  2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1800
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1801
  o  1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1802
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1803
  o  0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1804
  
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1805
  $ hg phase -r 6 --public
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1806
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1807
  $ hg graft --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1808
  cannot clean up public changesets 6ec71c037d94
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1809
  graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1810
  working directory is now at 6ec71c037d94
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1811
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1812
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
  1813
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1814
  $ hg up '.^^'
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1815
  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
  1816
  $ echo y > y
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1817
  $ hg ci -Aqm "added y"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1818
  $ echo z > z
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1819
  $ hg ci -Aqm "added z"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1820
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1821
  $ hg up 3
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1822
  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
  1823
  $ 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
  1824
  o  8:637f9e9bbfd4 added z
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1825
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1826
  o  7:123221671fd4 added y
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1827
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1828
  | o  6:6ec71c037d94 added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1829
  | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1830
  | | 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
  1831
  | | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1832
  | | | o  4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1833
  | | |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1834
  | @ |  3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1835
  |/ /
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1836
  o /  2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1837
  |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1838
  o  1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1839
  |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1840
  o  0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1841
  
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1842
  $ 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
  1843
  grafting 8:637f9e9bbfd4 "added z" (tip)
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1844
  grafting 7:123221671fd4 "added y"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1845
  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
  1846
  merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1847
  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
  1848
  abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1849
  (use 'hg resolve' and 'hg graft --continue')
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1850
  [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1851
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1852
  $ cd ..
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1853
  $ hg init pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1854
  $ cd pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1855
  $ cat >> .hg/hgrc <<EOF
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1856
  > [phases]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1857
  > publish=False
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1858
  > EOF
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1859
  $ 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
  1860
  pulling from ../abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1861
  requesting all changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1862
  adding changesets
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1863
  adding manifests
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1864
  adding file changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1865
  added 11 changesets with 9 changes to 8 files (+4 heads)
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1866
  new changesets 9092f1db7931:6b98ff0062dd
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1867
  (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
  1868
  $ hg up 9
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1869
  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
  1870
  $ echo w > w
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1871
  $ 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
  1872
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1873
  $ cd ../abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1874
  $ hg pull ../pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1875
  pulling from ../pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1876
  searching for changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1877
  adding changesets
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1878
  adding manifests
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1879
  adding file changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1880
  added 1 changesets with 1 changes to 1 files (+1 heads)
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1881
  new changesets 311dfc6cf3bf
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1882
  (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
  1883
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1884
  $ hg graft --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1885
  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
  1886
  graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
  1887
  working directory is now at 6b98ff0062dd
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1888
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1889
  $ cd ..
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1890
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1891
============================
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1892
Testing --no-commit option:|
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1893
============================
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1894
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1895
  $ hg init nocommit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1896
  $ cd nocommit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1897
  $ echo a > a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1898
  $ hg ci -qAma
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1899
  $ echo b > b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1900
  $ hg ci -qAmb
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1901
  $ hg up -q 0
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1902
  $ echo c > c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1903
  $ hg ci -qAmc
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1904
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1905
  @  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1906
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1907
  | o  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1908
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1909
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1910
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1911
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1912
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
  1913
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1914
  $ hg graft 1 --no-commit -e
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1915
  abort: cannot specify --no-commit and --edit together
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1916
  [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1917
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1918
  $ hg graft 1 --no-commit --log
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1919
  abort: cannot specify --no-commit and --log together
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1920
  [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1921
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1922
  $ hg graft 1 --no-commit -D
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1923
  abort: cannot specify --no-commit and --currentdate together
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1924
  [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1925
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1926
Test --no-commit is working:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1927
  $ hg graft 1 --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1928
  grafting 1:d2ae7f538514 "b"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1929
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1930
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1931
  @  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1932
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1933
  | o  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1934
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1935
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1936
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1937
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1938
  $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1939
  diff -r d36c0562f908 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1940
  --- /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
  1941
  +++ 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
  1942
  @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1943
  +b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1944
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1945
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
  1946
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1947
  $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1948
  $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1949
  $ hg ci -qm "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1950
  $ hg up -q 1
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1951
  $ echo B>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1952
  $ hg ci -qm "B in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1953
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1954
  @  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1955
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1956
  | o  3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1957
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1958
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1959
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1960
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1961
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1962
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1963
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1964
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1965
  $ hg graft 3 --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1966
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1967
  merging a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1968
  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
  1969
  abort: unresolved conflicts, can't continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1970
  (use 'hg resolve' and 'hg graft --continue')
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1971
  [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1972
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1973
Resolve conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1974
  $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1975
  $ hg resolve --mark
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1976
  (no more unresolved files)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1977
  continue: hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1978
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1979
  $ hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1980
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1981
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1982
  @  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1983
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1984
  | o  3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1985
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1986
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1987
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1988
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1989
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1990
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1991
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1992
  $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1993
  diff -r 2aa9ad1006ff a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1994
  --- 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
  1995
  +++ 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
  1996
  @@ -1,1 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1997
  -B
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1998
  +A
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  1999
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2000
  $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2001
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2002
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
  2003
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2004
  $ hg graft 3
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2005
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2006
  merging a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2007
  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
  2008
  abort: unresolved conflicts, can't continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2009
  (use 'hg resolve' and 'hg graft --continue')
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2010
  [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2011
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2012
Resolve conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2013
  $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2014
  $ hg resolve --mark
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2015
  (no more unresolved files)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2016
  continue: hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2017
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2018
  $ hg graft --continue --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2019
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2020
  $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2021
  diff -r 2aa9ad1006ff a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2022
  --- 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
  2023
  +++ 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
  2024
  @@ -1,1 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2025
  -B
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2026
  +A
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2027
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2028
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2029
  @  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2030
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2031
  | o  3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2032
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2033
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2034
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2035
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2036
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2037
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2038
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2039
  $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2040
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2041
Test --no-commit when graft multiple revisions:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2042
When there is conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2043
  $ hg graft -r "2::3" --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2044
  grafting 2:d36c0562f908 "c"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2045
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2046
  merging a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2047
  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
  2048
  abort: unresolved conflicts, can't continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2049
  (use 'hg resolve' and 'hg graft --continue')
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2050
  [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2051
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2052
  $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2053
  $ hg resolve --mark
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2054
  (no more unresolved files)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2055
  continue: hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2056
  $ hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2057
  grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2058
  $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2059
  diff -r 2aa9ad1006ff a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2060
  --- 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
  2061
  +++ 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
  2062
  @@ -1,1 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2063
  -B
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2064
  +A
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2065
  diff -r 2aa9ad1006ff c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2066
  --- /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
  2067
  +++ 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
  2068
  @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2069
  +c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2070
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2071
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2072
  @  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2073
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2074
  | o  3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2075
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2076
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2077
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2078
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2079
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2080
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2081
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2082
  $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2083
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2084
When there is no conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2085
  $ echo d>d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2086
  $ hg add d -q
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2087
  $ hg ci -qmd
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2088
  $ hg up 3 -q
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2089
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2090
  o  5:baefa8927fc0 d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2091
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2092
  o  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2093
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2094
  | @  3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2095
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2096
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2097
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2098
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2099
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2100
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2101
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2102
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2103
  $ hg graft -r 1 -r 5 --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2104
  grafting 1:d2ae7f538514 "b"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2105
  grafting 5:baefa8927fc0 "d" (tip)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2106
  $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2107
  diff -r 09e253b87e17 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2108
  --- /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
  2109
  +++ 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
  2110
  @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2111
  +b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2112
  diff -r 09e253b87e17 d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2113
  --- /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
  2114
  +++ 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
  2115
  @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2116
  +d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2117
  $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2118
  o  5:baefa8927fc0 d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2119
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2120
  o  4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2121
  |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2122
  | @  3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2123
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2124
  | o  2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2125
  | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2126
  o |  1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2127
  |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2128
  o  0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2129
  
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
  2130
  $ cd ..