annotate tests/test-graft.t @ 42415:c767e655ffda

narrow: use narrow_widen wireproto command to widen in case of ellipses Few releases ago, we introduce narrow_widen wireproto command to be used to widen narrow repositories. Before this patch, that was used in non-ellipses cases only. In ellipses cases, we still do exchange.pull() which can pull more data than required. After this patch, the client will first check whether server supports doing ellipses widening using wireproto command or not by checking server's wireproto capability. If the server is upto date and support latest ellipses capability, we call the wireproto command. Otherwise we fallback to exchange.pull() like before. The compat code make sure that things works even if one of the client or server is old. The initial version of this patch does not had this compat code. It's added to help Google release things smoothly internally. I plan to drop the compat code before the upcoming major release. Due to change to wireproto command, the code looks a bit dirty, next patches will clean that up. Differential Revision: https://phab.mercurial-scm.org/D6436
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 22 May 2019 02:59:48 +0530
parents 8988e640a8ac
children 12243f15d53e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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
40434
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
28 $ hg merge -q default --tool internal:local # for conflicts in e, choose 5 and ignore 4
15361
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
40434
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
49 Test --base for grafting the merge of 4 from the perspective of 5, thus only getting the change to d
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
50
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
51 $ hg up -cqr 3
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
52 $ hg graft -r 6 --base 5
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
53 grafting 6:25a2b029d3ae "6" (tip)
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
54 merging e
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
55 $ hg st --change .
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
56 M d
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
57
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
58 $ hg -q strip . --config extensions.strip=
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
59
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
60 Test --base for collapsing changesets 2 and 3, thus getting both b and c
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
61
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
62 $ hg up -cqr 0
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
63 $ hg graft -r 3 --base 1
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
64 grafting 3:4c60f11aa304 "3"
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
65 merging a and b to b
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
66 merging a and c to c
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
67 $ hg st --change .
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
68 A b
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
69 A c
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
70 R a
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
71
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
72 $ hg -q strip . --config extensions.strip=
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
73
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
74 Specifying child as --base revision fails safely (perhaps slightly confusing, but consistent)
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
75
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
76 $ hg graft -r 2 --base 3
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
77 grafting 2:5c095ad7e90f "2"
42222
57203e0210f8 copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents: 42169
diff changeset
78 note: possible conflict - c was deleted and renamed to:
57203e0210f8 copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents: 42169
diff changeset
79 a
40434
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
80 note: graft of 2:5c095ad7e90f created no changes to commit
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
81
28121
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
82 Can't continue without starting:
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
83
40434
3c0d5016b2be graft: introduce --base option for using custom base revision while merging
Mads Kiilerich <mads@kiilerich.com>
parents: 39480
diff changeset
84 $ hg -q up -cr tip
28121
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
85 $ hg rm -q e
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
86 $ hg graft --continue
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
87 abort: no graft in progress
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
88 [255]
bd97ed121016 graft: suggest the correct tool to continue (not graft)
timeless <timeless@mozdev.org>
parents: 28052
diff changeset
89 $ hg revert -r . -q e
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
90
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
91 Need to specify a rev:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
92
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
93 $ hg graft
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
94 abort: no revisions specified
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
95 [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
96
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
97 Can't graft ancestor:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
98
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
99 $ hg graft 1 2
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
100 skipping ancestor revision 1:5d205f8b35b6
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
101 skipping ancestor revision 2:5c095ad7e90f
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
102 [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
103
16992
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
104 Specify revisions with -r:
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
105
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
106 $ hg graft -r 1 -r 2
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
107 skipping ancestor revision 1:5d205f8b35b6
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
108 skipping ancestor revision 2:5c095ad7e90f
16992
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
109 [255]
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
110
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
111 $ 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
112 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
113 skipping ancestor revision 2:5c095ad7e90f
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
114 skipping ancestor revision 1:5d205f8b35b6
16992
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
115 [255]
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
116
41174
08dd462ea782 graft: abort if --date/user specified with --currentdate/currentuser (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 40676
diff changeset
117 Conflicting date/user options:
08dd462ea782 graft: abort if --date/user specified with --currentdate/currentuser (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 40676
diff changeset
118
08dd462ea782 graft: abort if --date/user specified with --currentdate/currentuser (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 40676
diff changeset
119 $ hg up -q 0
08dd462ea782 graft: abort if --date/user specified with --currentdate/currentuser (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 40676
diff changeset
120 $ hg graft -U --user foo 2
08dd462ea782 graft: abort if --date/user specified with --currentdate/currentuser (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 40676
diff changeset
121 abort: --user and --currentuser are mutually exclusive
08dd462ea782 graft: abort if --date/user specified with --currentdate/currentuser (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 40676
diff changeset
122 [255]
08dd462ea782 graft: abort if --date/user specified with --currentdate/currentuser (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 40676
diff changeset
123 $ hg graft -D --date '0 0' 2
08dd462ea782 graft: abort if --date/user specified with --currentdate/currentuser (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 40676
diff changeset
124 abort: --date and --currentdate are mutually exclusive
08dd462ea782 graft: abort if --date/user specified with --currentdate/currentuser (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 40676
diff changeset
125 [255]
08dd462ea782 graft: abort if --date/user specified with --currentdate/currentuser (BC)
Yuya Nishihara <yuya@tcha.org>
parents: 40676
diff changeset
126
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
127 Can't graft with dirty wd:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
128
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
129 $ hg up -q 0
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
130 $ echo foo > a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
131 $ hg graft 1
19804
061ce98c888d cmdutil.bailifchanged: standardize error message for dirty working dir
Siddharth Agarwal <sid0@fb.com>
parents: 19476
diff changeset
132 abort: uncommitted changes
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
133 [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
134 $ hg revert a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
135
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
136 Graft a rename:
21416
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
137 (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
138
21416
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
139 $ 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
140 A b
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
141 R a
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
142 $ 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
143 grafting 2:5c095ad7e90f "2"
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
144 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
145 2
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
146
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
147
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
148 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
149 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
150 HG: --
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
151 HG: user: foo
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
152 HG: branch 'default'
22897
8fe74328f700 dirstate: merge falls through to otherparent
Matt Mackall <mpm@selenic.com>
parents: 22305
diff changeset
153 HG: added b
21416
3e717c9376fc graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21391
diff changeset
154 HG: removed a
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
155 $ hg export tip --git
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
156 # HG changeset patch
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
157 # User foo
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
158 # 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
159 # 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
160 # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
161 # Parent 68795b066622ca79a25816a662041d8f78f3cd9e
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
162 2
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
163
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
164 diff --git a/a b/b
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
165 rename from a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
166 rename to b
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
167
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
168 Look for extra:source
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
169
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
170 $ 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
171 changeset: 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
172 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
173 phase: draft
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
174 parent: 0:68795b066622ca79a25816a662041d8f78f3cd9e
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
175 parent: -1:0000000000000000000000000000000000000000
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
176 manifest: 7:e59b6b228f9cbf9903d5e9abf996e083a1f533eb
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
177 user: foo
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
178 date: Thu Jan 01 00:00:00 1970 +0000
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
179 files+: b
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
180 files-: a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
181 extra: branch=default
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
182 extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
183 description:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
184 2
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
185
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
186
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
187
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
188 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
189 (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
190
16389
79fecd735d26 graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents: 16094
diff changeset
191 $ 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
192 skipping ungraftable merge revision 6
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
193 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
194 grafting 1:5d205f8b35b6 "1"
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
195 grafting 5:97f8bfe72746 "5"
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
196 grafting 4:9c233e8e184d "4"
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
197 grafting 3:4c60f11aa304 "3"
16389
79fecd735d26 graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents: 16094
diff changeset
198
27173
8a8f5d71a49a graft: improve --continue abort message
timeless <timeless@mozdev.org>
parents: 27172
diff changeset
199 $ HGEDITOR=cat hg graft 1 5 'merge()' 2 --debug
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
200 skipping ungraftable merge revision 6
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
201 scanning for duplicate grafts
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
202 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
203 grafting 1:5d205f8b35b6 "1"
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
204 unmatched files in local:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
205 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
206 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
207 src: 'a' -> dst: 'b' *
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
208 checking for directory renames
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
209 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
210 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
211 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
212 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
213 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
214 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
215 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
216 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
217 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
218 premerge successful
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
219 committing files:
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
220 b
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
221 committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
222 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
223 updating the branch cache
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
224 grafting 5:97f8bfe72746 "5"
42222
57203e0210f8 copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents: 42169
diff changeset
225 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
57203e0210f8 copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents: 42169
diff changeset
226 src: 'c' -> dst: 'b'
57203e0210f8 copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents: 42169
diff changeset
227 checking for directory renames
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
228 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
229 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
230 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21267
diff changeset
231 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
232 getting e
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
233 committing files:
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
234 e
23749
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
235 committing manifest
a387b0390082 localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents: 23514
diff changeset
236 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
237 updating the branch cache
27173
8a8f5d71a49a graft: improve --continue abort message
timeless <timeless@mozdev.org>
parents: 27172
diff changeset
238 $ HGEDITOR=cat hg graft 4 3 --log --debug
8a8f5d71a49a graft: improve --continue abort message
timeless <timeless@mozdev.org>
parents: 27172
diff changeset
239 scanning for duplicate grafts
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
240 grafting 4:9c233e8e184d "4"
42222
57203e0210f8 copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents: 42169
diff changeset
241 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
57203e0210f8 copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents: 42169
diff changeset
242 src: 'c' -> dst: 'b'
57203e0210f8 copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents: 42169
diff changeset
243 checking for directory renames
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
244 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
245 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
246 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
247 preserving e for resolve of e
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21267
diff changeset
248 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
249 getting d
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
250 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
251 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
252 merging e
28011
8abd9f785030 merge: add file ancestor linknode to mergestate
Durham Goode <durham@fb.com>
parents: 27899
diff changeset
253 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
254 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
255 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
256 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
257 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
258 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
259 (use 'hg resolve' and 'hg graft --continue')
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
260 [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
261
27172
4d61c847e06c summary: mention graft
timeless <timeless@mozdev.org>
parents: 27161
diff changeset
262 Summary should mention graft:
4d61c847e06c summary: mention graft
timeless <timeless@mozdev.org>
parents: 27161
diff changeset
263
4d61c847e06c summary: mention graft
timeless <timeless@mozdev.org>
parents: 27161
diff changeset
264 $ hg summary |grep graft
4d61c847e06c summary: mention graft
timeless <timeless@mozdev.org>
parents: 27161
diff changeset
265 commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)
4d61c847e06c summary: mention graft
timeless <timeless@mozdev.org>
parents: 27161
diff changeset
266
33771
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
267 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
268
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
269 $ 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
270 M d
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
271 M e
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
272 ? a.orig
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
273 ? e.orig
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
274 # 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
275
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
276 # 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
277 #
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
278 # e
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
279 #
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
280 # 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
281
38341
50f5fc232c16 morestatus: remove some extra spaces
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38311
diff changeset
282 # To continue: hg graft --continue
38966
5b04b6204931 status: advertise --abort instead of 'update -C .' to abort graft
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 38473
diff changeset
283 # To abort: hg graft --abort
33771
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
284
96f43981c1c4 morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32267
diff changeset
285
19253
e078ea9b4ce4 graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents: 18648
diff changeset
286 Commit while interrupted should fail:
e078ea9b4ce4 graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents: 18648
diff changeset
287
e078ea9b4ce4 graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents: 18648
diff changeset
288 $ hg ci -m 'commit interrupted graft'
19476
4fed15d4c5aa commands: add checks for unfinished operations (issue3955)
Matt Mackall <mpm@selenic.com>
parents: 19332
diff changeset
289 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
290 (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
291 [255]
e078ea9b4ce4 graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents: 18648
diff changeset
292
19332
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
293 Abort the graft and try committing:
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
294
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
295 $ hg up -C .
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
296 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
297 $ echo c >> e
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
298 $ hg ci -mtest
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
299
23514
3575f42e1b7b test-graft: use strip extension instead of mq extension
Augie Fackler <raf@durin42.com>
parents: 23508
diff changeset
300 $ hg strip . --config extensions.strip=
19332
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
301 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
302 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
303
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
304 Graft again:
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
305
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
306 $ 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
307 skipping ungraftable merge revision 6
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
308 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
309 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
310 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
311 grafting 4:9c233e8e184d "4"
19332
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
312 merging e
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
313 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
314 abort: unresolved conflicts, can't continue
28963
fc1d75e7a98d graft: use single quotes around command hint
timeless <timeless@mozdev.org>
parents: 28634
diff changeset
315 (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
316 [255]
0af993732f66 update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents: 19253
diff changeset
317
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
318 Continue without resolve should fail:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
319
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
320 $ hg graft -c
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
321 grafting 4:9c233e8e184d "4"
29975
c15f06109b7a localrepo: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 28963
diff changeset
322 abort: unresolved merge conflicts (see 'hg help resolve')
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
323 [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
324
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
325 Fix up:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
326
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
327 $ echo b > e
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
328 $ 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
329 (no more unresolved files)
27625
cdb9493a7e2f graft: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents: 27173
diff changeset
330 continue: hg graft --continue
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
331
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
332 Continue with a revision should fail:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
333
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
334 $ hg graft -c 6
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
335 abort: can't specify --continue and revisions
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
336 [255]
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
337
16992
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
338 $ hg graft -c -r 6
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
339 abort: can't specify --continue and revisions
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
340 [255]
55e7f352b1d3 graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents: 16913
diff changeset
341
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
342 Continue for real, clobber usernames
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
343
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
344 $ hg graft -c -U
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
345 grafting 4:9c233e8e184d "4"
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
346 grafting 3:4c60f11aa304 "3"
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
347
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
348 Compare with original:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
349
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
350 $ hg diff -r 6
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
351 $ hg status --rev 0:. -C
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
352 M d
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
353 M e
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
354 A b
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
355 a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
356 A c
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
357 a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
358 R a
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
359
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
360 View graph:
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
361
20117
aa9385f983fa tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents: 19893
diff changeset
362 $ 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
363 @ test@11.draft: 3
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
364 |
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
365 o test@10.draft: 4
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
366 |
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
367 o test@9.draft: 5
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
368 |
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
369 o bar@8.draft: 1
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
370 |
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
371 o foo@7.draft: 2
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
372 |
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
373 | o test@6.secret: 6
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
374 | |\
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
375 | | o test@5.draft: 5
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
376 | | |
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
377 | o | test@4.draft: 4
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
378 | |/
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
379 | o baz@3.public: 3
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
380 | |
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
381 | o test@2.public: 2
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
382 | |
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
383 | o bar@1.public: 1
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
384 |/
15918
4f9853e7f690 graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents: 15907
diff changeset
385 o test@0.public: 0
15361
c1930992e111 graft: add a test
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
386
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
387 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
388 $ hg up -q 0
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
389 $ echo 'g'>g
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
390 $ hg add g
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
391 $ hg ci -m 7
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
392 created new head
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
393 $ hg graft 7
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
394 grafting 7:ef0ef43d49e7 "2"
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
395
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
396 $ 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
397 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
398 $ 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
399 2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
400
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
401 $ hg log --debug -r tip
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
402 changeset: 13:7a4785234d87ec1aa420ed6b11afe40fa73e12a9
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
403 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
404 phase: draft
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
405 parent: 12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
406 parent: -1:0000000000000000000000000000000000000000
16601
0c98820be15c filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents: 16600
diff changeset
407 manifest: 13:dc313617b8c32457c0d589e0dbbedfe71f3cd637
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
408 user: foo
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
409 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
410 files+: b
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
411 files-: a
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
412 extra: branch=default
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
413 extra: intermediate-source=ef0ef43d49e79e81ddafdc7997401ba0041efc82
15506
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
414 extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
415 description:
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
416 2
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
417
dc9fb7015d7f graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15361
diff changeset
418
15508
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
419 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
420 $ hg up -q 6
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
421 $ hg graft 7
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
422 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
423 [255]
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
424
28052
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
425 $ 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
426 --- */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
427 +++ */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
428 @@ -1,18 +1,18 @@
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
429 # HG changeset patch
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
430 -# User test
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
431 +# User foo
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
432 # Date 0 0
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
433 # 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
434 -# Node ID 5c095ad7e90f871700f02dd1fa5012cb4498a2d4
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
435 -# Parent 5d205f8b35b66bc36375c9534ffd3237730e8f04
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
436 +# Node ID 7a4785234d87ec1aa420ed6b11afe40fa73e12a9
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
437 +# Parent b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
438 2
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
439
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
440 -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
441 +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
442 --- 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
443 +++ /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
444 @@ -1,1 +0,0 @@
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
445 --b
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
446 -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
447 +-a
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
448 +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
449 --- /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
450 +++ 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
451 @@ -0,0 +1,1 @@
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
452 -+b
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
453 ++a
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
454 [1]
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
455
28052
b59ef0c21405 tests: use portable diff script via extdiff extension
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 28034
diff changeset
456 $ 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
457 --- */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
458 +++ */hg-7a4785234d87.patch * (glob)
26229
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
459 @@ -1,8 +1,8 @@
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
460 # HG changeset patch
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
461 -# User test
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
462 +# User foo
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
463 # Date 0 0
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
464 # 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
465 -# Node ID 5c095ad7e90f871700f02dd1fa5012cb4498a2d4
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
466 -# Parent 5d205f8b35b66bc36375c9534ffd3237730e8f04
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
467 +# Node ID 7a4785234d87ec1aa420ed6b11afe40fa73e12a9
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
468 +# Parent b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
469 2
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
470
d1530c6e8613 extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents: 26228
diff changeset
471 [1]
26228
0fd20a71abdb extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents: 25589
diff changeset
472
15508
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
473 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
474 $ 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
475 $ hg graft 2
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
476 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
477 [255]
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
478 $ hg graft 7
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
479 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
480 [255]
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
481
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
482 $ hg up -q 7
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
483 $ hg graft 2
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
484 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
485 [255]
00276525e2b7 graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents: 15507
diff changeset
486 $ hg graft tip
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
487 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
488 [255]
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
489
16660
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
490 Graft with --log
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
491
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
492 $ hg up -Cq 1
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
493 $ 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
494 grafting 3:4c60f11aa304 "3"
16660
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
495 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
496 $ 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
497 14:0c921c65ef1e 1:5d205f8b35b6 3
16660
2a71cc53f244 graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents: 16601
diff changeset
498 (grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8)
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16795
diff changeset
499
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
500 Resolve conflicted graft
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
501 $ 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
502 $ echo b > 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 8
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
504 created new head
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
505 $ 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
506 $ 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
507 $ 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
508 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
509 abort: unresolved conflicts, can't continue
28963
fc1d75e7a98d graft: use single quotes around command hint
timeless <timeless@mozdev.org>
parents: 28634
diff changeset
510 (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
511 [255]
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
512 $ hg resolve --all
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
513 merging a
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
514 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
515 [1]
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
516 $ cat a
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
517 <<<<<<< local: aaa4406d4f0a - test: 9
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
518 c
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
519 =======
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
520 b
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30229
diff changeset
521 >>>>>>> graft: 5d205f8b35b6 - bar: 1
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
522 $ echo b > a
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
523 $ 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
524 (no more unresolved files)
27625
cdb9493a7e2f graft: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents: 27173
diff changeset
525 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
526 $ hg graft -c
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
527 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
528 $ 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
529 # HG changeset patch
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
530 # User bar
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
531 # 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
532 # 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
533 # Node ID f67661df0c4804d301f064f332b57e7d5ddaf2be
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
534 # Parent aaa4406d4f0ae9befd6e58c82ec63706460cbca6
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
535 1
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
536
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
537 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
538 --- a/a
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
539 +++ b/a
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
540 @@ -1,1 +1,1 @@
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
541 -c
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
542 +b
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
543
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
544 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
545 $ echo c > a
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
546 $ 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
547 $ 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
548 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
549 abort: unresolved conflicts, can't continue
28963
fc1d75e7a98d graft: use single quotes around command hint
timeless <timeless@mozdev.org>
parents: 28634
diff changeset
550 (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
551 [255]
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
552 $ hg resolve --all
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
553 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
554 (no more unresolved files)
27625
cdb9493a7e2f graft: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents: 27173
diff changeset
555 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
556 $ hg graft -c
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
557 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
558 $ 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
559 # HG changeset patch
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
560 # User test
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
561 # 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
562 # 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
563 # Node ID 9627f653b421c61fc1ea4c4e366745070fa3d2bc
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
564 # Parent ee295f490a40b97f3d18dd4c4f1c8936c233b612
17045
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
565 2
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
566
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
567 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
568 rename from a
52ea9ce5b641 graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents: 16509
diff changeset
569 rename to b
17185
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
570
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
571 Test simple origin(), with and without args
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
572 $ hg log -r 'origin()'
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
573 changeset: 1:5d205f8b35b6
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
574 user: bar
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
575 date: Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
576 summary: 1
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
577
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
578 changeset: 2:5c095ad7e90f
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
579 user: test
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
580 date: Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
581 summary: 2
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
582
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
583 changeset: 3:4c60f11aa304
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
584 user: baz
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
585 date: Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
586 summary: 3
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
587
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
588 changeset: 4:9c233e8e184d
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
589 user: test
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
590 date: Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
591 summary: 4
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
592
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
593 changeset: 5:97f8bfe72746
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
594 branch: stable
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
595 parent: 3:4c60f11aa304
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
596 user: test
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
597 date: Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
598 summary: 5
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
599
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
600 $ hg log -r 'origin(7)'
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
601 changeset: 2:5c095ad7e90f
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
602 user: test
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
603 date: Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
604 summary: 2
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
605
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
606 Now transplant a graft to test following through copies
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
607 $ hg up -q 0
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
608 $ hg branch -q dev
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
609 $ hg ci -qm "dev branch"
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
610 $ hg --config extensions.transplant= transplant -q 7
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
611 $ hg log -r 'origin(.)'
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
612 changeset: 2:5c095ad7e90f
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
613 user: test
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
614 date: Thu Jan 01 00:00:00 1970 +0000
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
615 summary: 2
2c7c4824969e revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17059
diff changeset
616
21765
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
617 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
618 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
619 tests.
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
620 $ 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
621
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
622 The graft case
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
623 $ 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
624 7: 7ae846e9111fc8f57745634250c7b9ac0a60689b
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
625 branch=default
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
626 convert_revision=ef0ef43d49e79e81ddafdc7997401ba0041efc82
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
627 source=e0213322b2c1a5d5d236c74e79666441bee67a7d
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
628 $ 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
629 changeset: 2:e0213322b2c1
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
630 user: test
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
631 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
632 summary: 2
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
633
25589
273d94255e1e convert: update 'intermediate-source' in the destination's extras dictionary
Matt Harbison <matt_harbison@yahoo.com>
parents: 25125
diff changeset
634 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
635 '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
636 $ 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
637 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
638 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
639 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
640 Extra: source=e0213322b2c1a5d5d236c74e79666441bee67a7d
a3c2d9211294 templater: don't overwrite the keyword mapping in runsymbol() (issue4362)
Matt Harbison <matt_harbison@yahoo.com>
parents: 22897
diff changeset
641
21765
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
642 The transplant case
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
643 $ 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
644 21: fbb6c5cc81002f2b4b49c9d731404688bcae5ade
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
645 branch=dev
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
646 convert_revision=7e61b508e709a11d28194a5359bc3532d910af21
31452
52dabcc49968 templatekw: make join() escape values of extras (BC) (issue5504)
Yuya Nishihara <yuya@tcha.org>
parents: 30581
diff changeset
647 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
648 $ 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
649 changeset: 2:e0213322b2c1
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
650 user: test
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
651 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
652 summary: 2
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
653
44255f7ce886 convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents: 21416
diff changeset
654
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
655 Test simple destination
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
656 $ hg log -r 'destination()'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
657 changeset: 7:ef0ef43d49e7
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
658 parent: 0:68795b066622
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
659 user: foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
660 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
661 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
662
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
663 changeset: 8:6b9e5368ca4e
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
664 user: bar
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: 1
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 changeset: 9:1905859650ec
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
669 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
670 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
671 summary: 5
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
672
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
673 changeset: 10:52dc0b4c6907
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
674 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
675 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
676 summary: 4
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
677
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
678 changeset: 11:882b35362a6b
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
679 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
680 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
681 summary: 3
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
682
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
683 changeset: 13:7a4785234d87
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
684 user: foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
685 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
686 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
687
30188
8a864844d5a0 checkcopies: add a sanity check against false-positive copies
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 29975
diff changeset
688 changeset: 14:0c921c65ef1e
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
689 parent: 1:5d205f8b35b6
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
690 user: foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
691 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
692 summary: 3
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
693
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
694 changeset: 17:f67661df0c48
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
695 user: bar
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
696 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
697 summary: 1
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
698
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
699 changeset: 19:9627f653b421
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
700 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
701 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
702 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
703
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
704 changeset: 21:7e61b508e709
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
705 branch: dev
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
706 tag: tip
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
707 user: foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
708 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
709 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
710
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
711 $ hg log -r 'destination(2)'
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 tag: tip
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
731 user: foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
732 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
733 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
734
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
735 Transplants of grafts can find a destination...
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
736 $ hg log -r 'destination(7)'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
737 changeset: 21:7e61b508e709
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
738 branch: dev
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
739 tag: tip
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
740 user: foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
741 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
742 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
743
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
744 ... grafts of grafts unfortunately can't
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
745 $ hg graft -q 13 --debug
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
746 scanning for duplicate grafts
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
747 grafting 13:7a4785234d87 "2"
42164
96bd75e67a94 copies: fix up "fullcopy" with missing entries from "copy"
Martin von Zweigbergk <martinvonz@google.com>
parents: 42161
diff changeset
748 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
96bd75e67a94 copies: fix up "fullcopy" with missing entries from "copy"
Martin von Zweigbergk <martinvonz@google.com>
parents: 42161
diff changeset
749 src: 'a' -> dst: 'b' *
96bd75e67a94 copies: fix up "fullcopy" with missing entries from "copy"
Martin von Zweigbergk <martinvonz@google.com>
parents: 42161
diff changeset
750 checking for directory renames
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
751 resolving manifests
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
752 branchmerge: True, force: True, partial: False
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
753 ancestor: b592ea63bb0c, local: 7e61b508e709+, remote: 7a4785234d87
39187
2f89a7defe62 test-graft: add a missing output line for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents: 39111
diff changeset
754 starting 4 threads for background file closing (?)
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
755 committing files:
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
756 b
23929
a43fdf33a6be commit: remove reverse search for copy source when not in parent (issue4476)
Ryan McElroy <rmcelroy@fb.com>
parents: 23917
diff changeset
757 warning: can't find ancestor for 'b' copied from 'a'!
42286
8988e640a8ac commit: fix a typo ("form p1" -> "from p1")
Martin von Zweigbergk <martinvonz@google.com>
parents: 42222
diff changeset
758 reusing manifest from p1 (listed files actually unchanged)
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
759 committing changelog
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
760 updating the branch cache
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
761 $ hg log -r 'destination(13)'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
762 All copies of a cset
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
763 $ hg log -r 'origin(13) or destination(origin(13))'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
764 changeset: 2:5c095ad7e90f
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
765 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
766 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
767 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
768
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
769 changeset: 7:ef0ef43d49e7
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
770 parent: 0:68795b066622
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
771 user: foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
772 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
773 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
774
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
775 changeset: 13:7a4785234d87
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
776 user: foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
777 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
778 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
779
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
780 changeset: 19:9627f653b421
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
781 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
782 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
783 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
784
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
785 changeset: 21:7e61b508e709
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
786 branch: dev
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
787 user: foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
788 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
789 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
790
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
791 changeset: 22:3a4e92d81b97
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
792 branch: dev
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
793 tag: tip
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
794 user: foo
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
795 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
796 summary: 2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 17185
diff changeset
797
21200
a1381eea7c7d graft: do not use `.remove` on a smart set (regression)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21082
diff changeset
798
a1381eea7c7d graft: do not use `.remove` on a smart set (regression)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21082
diff changeset
799 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
800
a1381eea7c7d graft: do not use `.remove` on a smart set (regression)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 21082
diff changeset
801 $ 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
802 skipping ancestor revision 21:7e61b508e709
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
803 skipping ancestor revision 22:3a4e92d81b97
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
804 skipping revision 2:5c095ad7e90f (already grafted to 22:3a4e92d81b97)
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
805 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
806 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
807 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
808 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
809 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
810 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
811 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
812
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
813 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
814
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
815 $ hg graft 19 0 6
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
816 skipping ungraftable merge revision 6
23507
67045b5a903a graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents: 23506
diff changeset
817 skipping ancestor revision 0:68795b066622
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
818 skipping already grafted revision 19:9627f653b421 (22:3a4e92d81b97 also has origin 2:5c095ad7e90f)
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
819 [255]
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
820 $ hg graft 19 0 6 --force
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
821 skipping ungraftable merge revision 6
23505
bd5dbb8a05c8 graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents: 23504
diff changeset
822 grafting 19:9627f653b421 "2"
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
823 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
824 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
825 grafting 0:68795b066622 "0"
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
826
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
827 graft --force after backout
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
828
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
829 $ echo abc > a
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
830 $ hg ci -m 28
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
831 $ hg backout 28
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
832 reverting a
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
833 changeset 29:9d95e865b00c backs out changeset 28:cc20d29aec8d
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
834 $ hg graft 28
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
835 skipping ancestor revision 28:cc20d29aec8d
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
836 [255]
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
837 $ hg graft 28 --force
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
838 grafting 28:cc20d29aec8d "28"
21979
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
839 merging a
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
840 $ cat a
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
841 abc
c2863cfe8a8a graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21947
diff changeset
842
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
843 graft --continue after --force
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
844
23463
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
845 $ echo def > a
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
846 $ hg ci -m 31
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
847 $ hg graft 28 --force --tool internal:fail
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
848 grafting 28:cc20d29aec8d "28"
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
849 abort: unresolved conflicts, can't continue
28963
fc1d75e7a98d graft: use single quotes around command hint
timeless <timeless@mozdev.org>
parents: 28634
diff changeset
850 (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
851 [255]
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
852 $ hg resolve --all
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
853 merging a
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
854 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
855 [1]
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
856 $ echo abc > a
bb0143e12f35 graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents: 23167
diff changeset
857 $ hg resolve -m a
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
858 (no more unresolved files)
27625
cdb9493a7e2f graft: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents: 27173
diff changeset
859 continue: hg graft --continue
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
860 $ hg graft -c
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
861 grafting 28:cc20d29aec8d "28"
21980
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
862 $ cat a
f4e5753745e9 graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents: 21979
diff changeset
863 abc
22302
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
864
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
865 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
866 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
867
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
868 $ hg up -qC 7
9472284df4eb graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents: 21947
diff changeset
869 $ 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
870 $ 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
871 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
872 $ hg graft tmp
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
873 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
874 [255]
23504
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
875
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
876 Empty graft
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
877
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
878 $ hg up -qr 26
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
879 $ hg tag -f something
e172a1f2b5bb tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents: 23482
diff changeset
880 $ hg graft -qr 27
23508
2164226a5637 graft: drop cset description from empty commit message
Matt Mackall <mpm@selenic.com>
parents: 23507
diff changeset
881 $ hg graft -f 27
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
882 grafting 27:17d42b8f5d50 "28"
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 38966
diff changeset
883 note: graft of 27:17d42b8f5d50 created no changes to commit
24643
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
884
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
885 $ cd ..
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
886
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
887 Graft to duplicate a commit
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
888
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
889 $ hg init graftsibling
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
890 $ cd graftsibling
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
891 $ touch a
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
892 $ hg commit -qAm a
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
893 $ touch b
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
894 $ hg commit -qAm b
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
895 $ hg log -G -T '{rev}\n'
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
896 @ 1
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
897 |
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
898 o 0
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
899
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
900 $ hg up -q 0
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
901 $ hg graft -r 1
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
902 grafting 1:0e067c57feba "b" (tip)
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
903 $ hg log -G -T '{rev}\n'
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
904 @ 2
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
905 |
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
906 | o 1
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
907 |/
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
908 o 0
a8e6897dffbe graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents: 23929
diff changeset
909
24644
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
910 Graft to duplicate a commit twice
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
911
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
912 $ hg up -q 0
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
913 $ hg graft -r 2
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
914 grafting 2:044ec77f6389 "b" (tip)
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
915 $ hg log -G -T '{rev}\n'
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
916 @ 3
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
917 |
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
918 | o 2
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
919 |/
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
920 | o 1
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
921 |/
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
922 o 0
51930a7180bd graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents: 24643
diff changeset
923
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
924 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
925 ==================================
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
926
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
927 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
928
42055
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
929 Consider this topology for a regular graft:
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
930
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
931 o c1
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
932 |
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
933 | o c2
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
934 | |
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
935 | o ca # stands for "common ancestor"
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
936 |/
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
937 o cta # stands for "common topological ancestor"
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
938
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
939 Note that in issue5343, ca==cta.
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
940
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
941 The following table shows the possible cases. Here, "x->y" and, equivalently,
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
942 "y<-x", where x is an ancestor of y, means that some copy happened from x to y.
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
943
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
944 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
945 A.0 | | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
946 A.1 | X | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
947 A.2 | | X |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
948 A.3 | | | X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
949 A.4 | X | X |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
950 A.5 | X | | X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
951 A.6 | | X | X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
952 A.7 | X | X | X
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
953
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
954 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
955 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
956 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
957 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
958 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
959 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
960 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
961 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
962 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
963 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
964 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
965 incomplete rename into a divergence.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
966 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
967
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
968 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
969 A.5 has a special case a<-b<-b->a, which is treated like a<-b->a in a merge.
42055
b9e5f3853a97 tests: better document the graft copy case
Martin von Zweigbergk <martinvonz@google.com>
parents: 41174
diff changeset
970 A.5 has issue5343 as a special case.
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
971 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
972 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
973 mergecopies.
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
974 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
975 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
976 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
977 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
978
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
979 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
980 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
981 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
982 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
983 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
984 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
985 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
986 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
987 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
988 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
989
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
990 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
991
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
992 $ hg init ../graftmove
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
993 $ cd ../graftmove
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
994 $ echo c1a > f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
995 $ echo c2a > f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
996 $ echo c3a > f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
997 $ echo c4a > f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
998 $ echo c5a > f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
999 $ hg ci -qAm A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1000 $ hg mv f1a f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1001 $ hg mv f3a f3b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1002 $ hg mv f5a f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1003 $ hg ci -qAm B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1004 $ echo c1c > f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1005 $ hg mv f2a f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1006 $ hg mv f5b f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1007 $ echo c5c > f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1008 $ hg ci -qAm C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1009 $ hg mv f3b f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1010 $ echo c4d > f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1011 $ hg ci -qAm D0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1012 $ hg log -G
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1013 @ changeset: 3:b69f5839d2d9
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1014 | tag: tip
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1015 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1016 | 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
1017 | summary: D0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1018 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1019 o changeset: 2:f58c7e2b28fa
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1020 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1021 | 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
1022 | summary: C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1023 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1024 o changeset: 1:3d7bba921b5d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1025 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1026 | 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
1027 | summary: B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1028 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1029 o changeset: 0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1030 user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1031 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
1032 summary: A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1033
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1034
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1035 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
1036 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
1037
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1038 $ hg up -q 'desc("A0")'
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1039 $ 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
1040 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
1041 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
1042 merging f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1043 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
1044 $ 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
1045 M f1a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1046 M f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1047 A f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1048 R f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1049 $ 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
1050 c1c
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1051 $ 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
1052 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
1053 [1]
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1054
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1055 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
1056
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1057 $ 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
1058 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
1059 note: possible conflict - f3b was renamed multiple times to:
42110
3a7efcbdf288 copies: print list of divergent renames in sorted order
Martin von Zweigbergk <martinvonz@google.com>
parents: 42055
diff changeset
1060 f3a
30201
856ead835f56 checkcopies: handle divergences contained entirely in tca::ctx
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30197
diff changeset
1061 f3d
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1062 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
1063
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1064 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
1065
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1066 $ 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
1067 $ hg mv f1a f1e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1068 $ echo c2e > f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1069 $ hg mv f3a f3e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1070 $ hg mv f4a f4e
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1071 $ hg mv f5a f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1072 $ hg ci -qAm "E0"
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1073 $ hg up -q "min(desc("A0"))"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1074 $ hg cp f1a f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1075 $ hg ci -qAm "F0"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1076 $ hg up -q "min(desc("A0"))"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1077 $ hg cp f1a f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1078 $ echo c1g > f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1079 $ hg ci -qAm "G0"
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1080 $ hg log -G
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1081 @ changeset: 8:ba67f08fb15a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1082 | tag: tip
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1083 | parent: 0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1084 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1085 | date: Thu Jan 01 00:00:00 1970 +0000
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1086 | summary: G0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1087 |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1088 | o changeset: 7:d376ab0d7fda
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1089 |/ parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1090 | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1091 | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1092 | summary: F0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1093 |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1094 | o changeset: 6:6bd1736cab86
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1095 |/ parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1096 | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1097 | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1098 | summary: E0
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1099 |
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
1100 | o changeset: 5:560daee679da
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1101 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1102 | | 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
1103 | | summary: D1
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1104 | |
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
1105 | o changeset: 4:c9763722f9bd
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1106 |/ parent: 0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1107 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1108 | 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
1109 | summary: C1
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1110 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1111 | o changeset: 3:b69f5839d2d9
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1112 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1113 | | 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
1114 | | summary: D0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1115 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1116 | o changeset: 2:f58c7e2b28fa
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1117 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1118 | | 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
1119 | | summary: C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1120 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1121 | o changeset: 1:3d7bba921b5d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1122 |/ user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1123 | 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
1124 | summary: B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1125 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1126 o changeset: 0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1127 user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1128 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
1129 summary: A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1130
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1131
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1132 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
1133 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
1134
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1135 $ hg up -q "desc("E0")"
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1136 $ 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
1137 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
1138 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
1139 merging f2a and f2c to f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1140
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1141 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
1142
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1143 $ 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
1144 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
1145 note: possible conflict - f3b was renamed multiple times to:
42110
3a7efcbdf288 copies: print list of divergent renames in sorted order
Martin von Zweigbergk <martinvonz@google.com>
parents: 42055
diff changeset
1146 f3d
30204
1894c830ee74 copies: make _checkcopies handle copy sequences spanning the TCA (issue4028)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30201
diff changeset
1147 f3e
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1148 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
1149 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
1150
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1151 $ hg cat f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1152 c2e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1153
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1154 Test the case A.5 (move case, f1x).
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1155
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1156 $ hg up -q "desc("C0")"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1157 BROKEN: Shouldn't get the warning about missing ancestor
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1158 $ HGEDITOR="echo E1 >" hg graft -r 'desc("E0")' --edit
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1159 grafting 6:6bd1736cab86 "E0"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1160 note: possible conflict - f1a was renamed multiple times to:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1161 f1b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1162 f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1163 note: possible conflict - f3a was renamed multiple times to:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1164 f3b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1165 f3e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1166 merging f2c and f2a to f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1167 merging f5a and f5b to f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1168 warning: can't find ancestor for 'f1e' copied from 'f1a'!
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1169 warning: can't find ancestor for 'f3e' copied from 'f3a'!
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1170 $ cat f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1171 c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1172
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1173 Test the case A.5 (copy case, f1x).
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1174
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1175 $ hg up -q "desc("C0")"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1176 BROKEN: Shouldn't get the warning about missing ancestor
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1177 $ HGEDITOR="echo F1 >" hg graft -r 'desc("F0")' --edit
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1178 grafting 7:d376ab0d7fda "F0"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1179 warning: can't find ancestor for 'f1f' copied from 'f1a'!
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1180 BROKEN: f1f should be marked a copy from f1b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1181 $ hg st --copies --change .
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1182 A f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1183 BROKEN: f1f should have the new content from f1b (i.e. "c1c")
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1184 $ cat f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1185 c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1186
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1187 Test the case A.5 (copy+modify case, f1x).
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1188
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1189 $ hg up -q "desc("C0")"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1190 BROKEN: We should get a merge conflict from the 3-way merge between f1b in C0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1191 (content "c1c") and f1g in G0 (content "c1g") with f1a in A0 as base (content
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1192 "c1a")
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1193 $ HGEDITOR="echo G1 >" hg graft -r 'desc("G0")' --edit
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1194 grafting 8:ba67f08fb15a "G0"
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1195 warning: can't find ancestor for 'f1g' copied from 'f1a'!
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1196
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1197 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
1198
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1199 $ hg log -CGv --patch --git
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1200 @ changeset: 13:ef3adf6c20a4
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1201 | tag: tip
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1202 | parent: 2:f58c7e2b28fa
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1203 | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1204 | date: Thu Jan 01 00:00:00 1970 +0000
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1205 | files: f1g
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1206 | description:
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1207 | G1
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1208 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1209 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1210 | diff --git a/f1g b/f1g
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1211 | new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1212 | --- /dev/null
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1213 | +++ b/f1g
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1214 | @@ -0,0 +1,1 @@
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1215 | +c1g
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1216 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1217 | o changeset: 12:b5542d755b54
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1218 |/ parent: 2:f58c7e2b28fa
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1219 | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1220 | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1221 | files: f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1222 | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1223 | F1
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1224 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1225 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1226 | diff --git a/f1f b/f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1227 | new file mode 100644
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1228 | --- /dev/null
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1229 | +++ b/f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1230 | @@ -0,0 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1231 | +c1a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1232 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1233 | o changeset: 11:f8a162271246
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1234 |/ parent: 2:f58c7e2b28fa
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1235 | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1236 | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1237 | files: f1e f2c f3e f4a f4e f5a f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1238 | copies: f4e (f4a) f5b (f5a)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1239 | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1240 | E1
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1241 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1242 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1243 | diff --git a/f1e b/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1244 | new file mode 100644
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1245 | --- /dev/null
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1246 | +++ b/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1247 | @@ -0,0 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1248 | +c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1249 | diff --git a/f2c b/f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1250 | --- a/f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1251 | +++ b/f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1252 | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1253 | -c2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1254 | +c2e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1255 | diff --git a/f3e b/f3e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1256 | new file mode 100644
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1257 | --- /dev/null
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1258 | +++ b/f3e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1259 | @@ -0,0 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1260 | +c3a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1261 | diff --git a/f4a b/f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1262 | rename from f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1263 | rename to f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1264 | diff --git a/f5a b/f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1265 | rename from f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1266 | rename to f5b
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1267 |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1268 | o changeset: 10:93ee502e8b0a
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1269 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1270 | | date: Thu Jan 01 00:00:00 1970 +0000
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1271 | | files: f3d f4e
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1272 | | description:
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1273 | | D2
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1274 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1275 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1276 | | 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
1277 | | new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1278 | | --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1279 | | +++ b/f3d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1280 | | @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1281 | | +c3a
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1282 | | diff --git a/f4e b/f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1283 | | --- a/f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1284 | | +++ b/f4e
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1285 | | @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1286 | | -c4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1287 | | +c4d
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1288 | |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1289 | o changeset: 9:539cf145f496
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1290 | | parent: 6:6bd1736cab86
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1291 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1292 | | date: Thu Jan 01 00:00:00 1970 +0000
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1293 | | files: f1e f2a f2c f5a f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1294 | | 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
1295 | | description:
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1296 | | C2
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1297 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1298 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1299 | | diff --git a/f1e b/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1300 | | --- a/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1301 | | +++ b/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1302 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1303 | | -c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1304 | | +c1c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1305 | | diff --git a/f2a b/f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1306 | | rename from f2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1307 | | rename to f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1308 | | diff --git a/f5b b/f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1309 | | rename from f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1310 | | rename to f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1311 | | --- a/f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1312 | | +++ b/f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1313 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1314 | | -c5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1315 | | +c5c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1316 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1317 | | o changeset: 8:ba67f08fb15a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1318 | | | parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1319 | | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1320 | | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1321 | | | files: f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1322 | | | copies: f1g (f1a)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1323 | | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1324 | | | G0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1325 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1326 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1327 | | | diff --git a/f1a b/f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1328 | | | copy from f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1329 | | | copy to f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1330 | | | --- a/f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1331 | | | +++ b/f1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1332 | | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1333 | | | -c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1334 | | | +c1g
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1335 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1336 | | | o changeset: 7:d376ab0d7fda
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1337 | | |/ parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1338 | | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1339 | | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1340 | | | files: f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1341 | | | copies: f1f (f1a)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1342 | | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1343 | | | F0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1344 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1345 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1346 | | | diff --git a/f1a b/f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1347 | | | copy from f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1348 | | | copy to f1f
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1349 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1350 | o | changeset: 6:6bd1736cab86
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1351 | |/ parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1352 | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1353 | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1354 | | files: f1a f1e f2a f3a f3e f4a f4e f5a f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1355 | | copies: f1e (f1a) f3e (f3a) f4e (f4a) f5b (f5a)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1356 | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1357 | | E0
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1358 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1359 | |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1360 | | diff --git a/f1a b/f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1361 | | rename from f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1362 | | rename to f1e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1363 | | diff --git a/f2a b/f2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1364 | | --- a/f2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1365 | | +++ b/f2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1366 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1367 | | -c2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1368 | | +c2e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1369 | | diff --git a/f3a b/f3e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1370 | | rename from f3a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1371 | | rename to f3e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1372 | | diff --git a/f4a b/f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1373 | | rename from f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1374 | | rename to f4e
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1375 | | diff --git a/f5a b/f5b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1376 | | rename from f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1377 | | rename to f5b
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1378 | |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1379 | | o changeset: 5:560daee679da
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1380 | | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1381 | | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1382 | | | files: f3d f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1383 | | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1384 | | | D1
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1385 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1386 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1387 | | | diff --git a/f3d b/f3d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1388 | | | new file mode 100644
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1389 | | | --- /dev/null
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1390 | | | +++ b/f3d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1391 | | | @@ -0,0 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1392 | | | +c3a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1393 | | | diff --git a/f4a b/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1394 | | | --- a/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1395 | | | +++ b/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1396 | | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1397 | | | -c4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1398 | | | +c4d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1399 | | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1400 | | o changeset: 4:c9763722f9bd
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1401 | |/ parent: 0:11f7a1b56675
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1402 | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1403 | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1404 | | files: f1a f2a f2c f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1405 | | copies: f2c (f2a)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1406 | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1407 | | C1
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1408 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1409 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1410 | | diff --git a/f1a b/f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1411 | | --- a/f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1412 | | +++ b/f1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1413 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1414 | | -c1a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1415 | | +c1c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1416 | | diff --git a/f2a b/f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1417 | | rename from f2a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1418 | | rename to f2c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1419 | | diff --git a/f5a b/f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1420 | | --- a/f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1421 | | +++ b/f5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1422 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1423 | | -c5a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1424 | | +c5c
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1425 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1426 +---o changeset: 3:b69f5839d2d9
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1427 | | user: test
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1428 | | date: Thu Jan 01 00:00:00 1970 +0000
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1429 | | files: f3b f3d f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1430 | | copies: f3d (f3b)
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1431 | | description:
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1432 | | D0
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1433 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1434 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1435 | | diff --git a/f3b b/f3d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1436 | | rename from f3b
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1437 | | rename to f3d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1438 | | diff --git a/f4a b/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1439 | | --- a/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1440 | | +++ b/f4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1441 | | @@ -1,1 +1,1 @@
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1442 | | -c4a
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1443 | | +c4d
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1444 | |
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1445 o | changeset: 2:f58c7e2b28fa
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1446 | | user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1447 | | 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
1448 | | 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
1449 | | copies: f2c (f2a) f5a (f5b)
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1450 | | description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1451 | | C0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1452 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1453 | |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1454 | | 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
1455 | | --- a/f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1456 | | +++ b/f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1457 | | @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1458 | | -c1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1459 | | +c1c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1460 | | 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
1461 | | rename from f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1462 | | rename to f2c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1463 | | 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
1464 | | rename from f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1465 | | rename to f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1466 | | --- a/f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1467 | | +++ b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1468 | | @@ -1,1 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1469 | | -c5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1470 | | +c5c
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1471 | |
42161
7815cf0ea88b tests: add test for issue5343 (grafting with copies)
Martin von Zweigbergk <martinvonz@google.com>
parents: 42110
diff changeset
1472 o | changeset: 1:3d7bba921b5d
30192
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1473 |/ user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1474 | 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
1475 | 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
1476 | 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
1477 | description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1478 | B0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1479 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1480 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1481 | 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
1482 | rename from f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1483 | rename to f1b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1484 | 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
1485 | rename from f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1486 | rename to f3b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1487 | 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
1488 | rename from f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1489 | rename to f5b
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1490 |
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1491 o changeset: 0:11f7a1b56675
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1492 user: test
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1493 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
1494 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
1495 description:
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1496 A0
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1497
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1498
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1499 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
1500 new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1501 --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1502 +++ b/f1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1503 @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1504 +c1a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1505 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
1506 new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1507 --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1508 +++ b/f2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1509 @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1510 +c2a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1511 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
1512 new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1513 --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1514 +++ b/f3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1515 @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1516 +c3a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1517 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
1518 new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1519 --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1520 +++ b/f4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1521 @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1522 +c4a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1523 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
1524 new file mode 100644
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1525 --- /dev/null
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1526 +++ b/f5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1527 @@ -0,0 +1,1 @@
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1528 +c5a
509d29255c04 tests: introduce tests for grafting through renames
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30188
diff changeset
1529
30229
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
1530 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
1531
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
1532 $ echo a > a
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
1533 $ hg ci -qAma
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
1534 $ 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
1535 $ echo b > b
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
1536 $ hg ci -qAmb
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
1537 $ echo c > c
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
1538 $ hg ci -qAmc
69ffbbe73dd0 merge: avoid superfluous filemerges when grafting through renames (issue5407)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30204
diff changeset
1539 $ 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
1540 $ 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
1541
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
1542 $ cd ..
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
1543
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
1544 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
1545
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
1546 $ 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
1547 $ 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
1548 $ 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
1549 $ 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
1550 $ 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
1551 $ 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
1552 $ 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
1553 $ 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
1554 $ 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
1555 $ 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
1556 $ 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
1557 $ 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
1558 $ 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
1559 $ 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
1560 $ 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
1561 $ 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
1562 $ 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
1563 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
1564
32204
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1565 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
1566
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1567 $ 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
1568 $ 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
1569 $ 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
1570 $ 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
1571
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1572 $ 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
1573 @ 7 xx
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1574 |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1575 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
1576 |\
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1577 | 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
1578 | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1579 +---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
1580 | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1581 | 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
1582 | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1583 | 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
1584 | |
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1585 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
1586 |/
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1587 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
1588
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1589 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
1590
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1591 $ 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
1592 $ 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
1593 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
1594 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
1595 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
1596
32205
b4e1e30528c7 graft: fix graft across merges of duplicates of grafted changes
Mads Kiilerich <madski@unity3d.com>
parents: 32204
diff changeset
1597 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
1598 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
1599
78fb569e2c33 graft: test coverage of grafts and how merges can break duplicate detection
Mads Kiilerich <madski@unity3d.com>
parents: 31452
diff changeset
1600 $ 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
1601 $ 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
1602 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
1603 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
1604 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
1605 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
1606 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
1607 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
1608
30581
43a9e02a7b7f graft: support grafting changes to new file in renamed directory (issue5436)
Gábor Stefanik <gabor.stefanik@nng.com>
parents: 30460
diff changeset
1609 $ cd ..
38149
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1610
40656
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1611 Grafted revision should be warned and skipped only once. (issue6024)
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1612
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1613 $ mkdir issue6024
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1614 $ cd issue6024
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1615
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1616 $ hg init base
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1617 $ cd base
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1618 $ touch x
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1619 $ hg commit -qAminit
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1620 $ echo a > x
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1621 $ hg commit -mchange
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1622 $ hg update -q 0
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1623 $ hg graft -r 1
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1624 grafting 1:a0b923c546aa "change" (tip)
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1625 $ cd ..
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1626
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1627 $ hg clone -qr 2 base clone
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1628 $ cd clone
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1629 $ hg pull -q
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1630 $ hg merge -q 2
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1631 $ hg commit -mmerge
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1632 $ hg update -q 0
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1633 $ hg graft -r 1
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1634 grafting 1:04fc6d444368 "change"
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1635 $ hg update -q 3
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1636 $ hg log -G -T '{rev}:{node|shortest} <- {extras.source|shortest}\n'
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1637 o 4:4e16 <- a0b9
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1638 |
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1639 | @ 3:f0ac <-
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1640 | |\
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1641 +---o 2:a0b9 <-
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1642 | |
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1643 | o 1:04fc <- a0b9
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1644 |/
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1645 o 0:7848 <-
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1646
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1647
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1648 the source of rev 4 is an ancestor of the working parent, and was also
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1649 grafted as rev 1. it should be stripped from the target revisions only once.
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1650
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1651 $ hg graft -r 4
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1652 skipping already grafted revision 4:4e16bab40c9c (1:04fc6d444368 also has origin 2:a0b923c546aa)
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1653 [255]
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1654
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1655 $ cd ../..
3bc2e550f2bd graft: do not try to skip rev derived from ancestor more than once (issue6024)
Yuya Nishihara <yuya@tcha.org>
parents: 39480
diff changeset
1656
38149
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1657 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
1658
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1659 $ hg init oldgraft
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1660 $ cd oldgraft
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1661 $ 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
1662 $ 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
1663 @ 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
1664 |
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1665 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
1666 |
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1667 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
1668
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1669 $ hg up 0
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1670 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
1671 $ echo bar > b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1672 $ hg add b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1673 $ 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
1674 created new head
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1675 $ 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
1676 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
1677 merging b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1678 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
1679 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
1680 (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
1681 [255]
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1682
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1683 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
1684
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1685 $ 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
1686 $ echo foo > b
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1687 $ hg resolve -m
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1688 (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
1689 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
1690 $ hg graft --continue
d1690a64268e graft: add test for reading old graftstate files with new mechanism
Pulkit Goyal <7895pulkit@gmail.com>
parents: 35393
diff changeset
1691 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
1692 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
1693
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1694 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
1695 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
1696
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1697 $ hg log -G
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1698 @ changeset: 5:711e9fa999f1
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1699 | tag: tip
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1700 | user: test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1701 | 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
1702 | summary: added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1703 |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1704 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
1705 | user: test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1706 | 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
1707 | summary: added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1708 |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1709 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
1710 | parent: 0:f7ad41964313
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1711 | user: test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1712 | 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
1713 | 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
1714 |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1715 | 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
1716 | | user: test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1717 | | 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
1718 | | summary: added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1719 | |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1720 | 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
1721 |/ user: test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1722 | 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
1723 | summary: added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1724 |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1725 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
1726 user: test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1727 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
1728 summary: added a
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1729
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1730
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1731 $ hg up '.^^'
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1732 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
1733
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1734 $ 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
1735 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
1736 merging b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1737 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
1738 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
1739 (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
1740 [255]
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1741
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1742 $ echo wat > b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1743 $ hg resolve -m
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1744 (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
1745 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
1746
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1747 $ hg graft --continue
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1748 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
1749 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
1750
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1751 $ 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
1752 @ 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
1753 | tag: tip
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
1754 | user: batman
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1755 | 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
1756 | summary: added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1757 |
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
1758 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
1759 | 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
1760 | user: batman
38153
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1761 | 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
1762 | summary: added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1763 |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1764 | 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
1765 | | user: test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1766 | | 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
1767 | | summary: added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1768 | |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1769 | 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
1770 |/ user: test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1771 | 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
1772 | summary: added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1773 |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1774 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
1775 | parent: 0:f7ad41964313
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1776 ~ user: test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1777 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
1778 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
1779
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1780 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
1781
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1782 $ hg up '.^^'
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1783 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
1784 $ 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
1785 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
1786 merging b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1787 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
1788 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
1789 (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
1790 [255]
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1791
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1792 $ echo foobar > b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1793 $ hg resolve -m
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1794 (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
1795 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
1796 $ hg graft --continue
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1797 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
1798 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
1799
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1800 $ 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
1801 @ 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
1802 | tag: tip
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1803 | user: test
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
1804 | 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
1805 | summary: added c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1806 |
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
1807 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
1808 | parent: 3:9e887f7a939c
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1809 | user: test
38154
decdb587ea12 graft: reuse --user and --date values in `hg graft --continue` (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38153
diff changeset
1810 | 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
1811 | summary: added b
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1812 |
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1813 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
1814 | parent: 0:f7ad41964313
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1815 ~ user: test
108ebd8eff5c tests: add test showing --continue not preserving --date and --user flags
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38149
diff changeset
1816 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
1817 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
1818
38237
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1819 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
1820
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1821 $ hg up '.^^'
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1822 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
1823 $ 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
1824 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
1825 merging b
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1826 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
1827 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
1828 (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
1829 [255]
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1830
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1831 $ echo foobar > b
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1832 $ hg resolve -m
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1833 (no more unresolved files)
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1834 continue: hg graft --continue
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1835
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1836 $ hg graft --continue
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1837 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
1838 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
1839
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1840 $ 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
1841 @ 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
1842 | (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
1843 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
1844 | (grafted from 80e6d2c47cfe5b3185519568327a17a061c7efb6)
38237
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1845 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
1846 |
66fc2ef8dbff graft: add test showing --continue not preserving --log passed earlier
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38155
diff changeset
1847 ~
38280
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1848
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1849 $ cd ..
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1850
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1851 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
1852
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1853 $ hg init stopgraft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1854 $ cd stopgraft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1855 $ 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
1856
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1857 $ hg log -G
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1858 @ changeset: 3:9150fe93bec6
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1859 | tag: tip
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1860 | user: test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1861 | 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
1862 | summary: added d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1863 |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1864 o changeset: 2:155349b645be
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1865 | user: test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1866 | 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
1867 | summary: added c
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1868 |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1869 o changeset: 1:5f6d8a4bf34a
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1870 | user: test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1871 | 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
1872 | summary: added b
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1873 |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1874 o changeset: 0:9092f1db7931
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1875 user: test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1876 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
1877 summary: added a
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1878
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1879 $ hg up '.^^'
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1880 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
1881
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1882 $ echo foo > d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1883 $ 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
1884
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1885 $ hg graft --stop
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1886 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
1887 [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1888
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1889 $ hg graft -r 3
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1890 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
1891 merging d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1892 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
1893 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
1894 (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
1895 [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1896
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1897 $ hg graft --stop --continue
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1898 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
1899 [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1900
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1901 $ hg graft --stop -U
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1902 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
1903 [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1904 $ 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
1905 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
1906 [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1907 $ hg graft --stop --log
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1908 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
1909 [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1910
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1911 $ hg graft --stop
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1912 stopped the interrupted graft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1913 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
1914
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1915 $ hg diff
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1916
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1917 $ hg log -Gr '.'
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1918 @ changeset: 4:a0deacecd59d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1919 | tag: tip
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1920 ~ parent: 1:5f6d8a4bf34a
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1921 user: test
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1922 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
1923 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
1924
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1925 $ 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
1926 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
1927 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
1928 merging d
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1929 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
1930 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
1931 (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
1932 [255]
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1933
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1934 $ hg graft --stop
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1935 stopped the interrupted graft
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1936 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
1937
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1938 $ hg diff
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1939
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1940 $ 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
1941 @ 5:75b447541a9e added c
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1942 |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1943 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
1944 |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1945 | 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
1946 | |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1947 | 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
1948 |/
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1949 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
1950 |
2ec44160165d graft: add a new `--stop` flag to stop interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38238
diff changeset
1951 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
1952
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1953 $ cd ..
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1954
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1955 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
1956 before the graft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1957
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1958 $ hg init abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1959 $ cd abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1960 $ 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
1961
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1962 $ hg up '.^^'
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1963 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
1964
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1965 $ echo x > x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1966 $ hg ci -Aqm "added x"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1967 $ hg up '.^'
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1968 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
1969 $ echo foo > c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1970 $ 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
1971
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1972 $ 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
1973 @ 5:36b793615f78 added foo to c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1974 |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1975 | o 4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1976 |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1977 | o 3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1978 | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1979 | o 2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1980 |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1981 o 1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1982 |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1983 o 0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1984
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1985 $ hg up 9150fe93bec6
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1986 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
1987
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1988 $ hg graft --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1989 abort: no interrupted graft to abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1990 [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1991
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1992 when stripping is required
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1993 $ hg graft -r 4 -r 5
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1994 grafting 4:863a25e1a9ea "added x"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1995 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
1996 merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1997 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
1998 abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
1999 (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
2000 [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2001
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2002 $ hg graft --continue --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2003 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
2004 [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2005
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2006 $ hg graft --abort --stop
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2007 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
2008 [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2009
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2010 $ hg graft --abort --currentuser
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2011 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
2012 [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2013
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2014 $ hg graft --abort --edit
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2015 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
2016 [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2017
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2018 $ hg graft --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2019 graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2020 working directory is now at 9150fe93bec6
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2021 $ 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
2022 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
2023 |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2024 | o 4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2025 |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2026 | @ 3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2027 | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2028 | o 2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2029 |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2030 o 1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2031 |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2032 o 0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2033
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2034 when stripping is not required
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2035 $ hg graft -r 5
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2036 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
2037 merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2038 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
2039 abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2040 (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
2041 [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2042
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2043 $ hg graft --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2044 graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2045 working directory is now at 9150fe93bec6
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2046 $ 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
2047 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
2048 |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2049 | o 4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2050 |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2051 | @ 3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2052 | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2053 | o 2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2054 |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2055 o 1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2056 |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2057 o 0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2058
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2059 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
2060
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2061 $ hg graft -r 4 -r 5
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2062 grafting 4:863a25e1a9ea "added x"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2063 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
2064 merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2065 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
2066 abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2067 (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
2068 [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2069
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2070 $ 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
2071 @ 6:6ec71c037d94 added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2072 |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2073 | 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
2074 | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2075 | | o 4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2076 | |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2077 o | 3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2078 | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2079 o | 2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2080 |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2081 o 1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2082 |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2083 o 0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2084
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2085 $ hg phase -r 6 --public
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2086
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2087 $ hg graft --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2088 cannot clean up public changesets 6ec71c037d94
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2089 graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2090 working directory is now at 6ec71c037d94
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2091
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2092 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
2093
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2094 $ hg up '.^^'
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2095 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
2096 $ echo y > y
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2097 $ hg ci -Aqm "added y"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2098 $ echo z > z
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2099 $ hg ci -Aqm "added z"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2100
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2101 $ hg up 3
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2102 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
2103 $ 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
2104 o 8:637f9e9bbfd4 added z
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2105 |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2106 o 7:123221671fd4 added y
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2107 |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2108 | o 6:6ec71c037d94 added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2109 | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2110 | | 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
2111 | | |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2112 | | | o 4:863a25e1a9ea added x
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2113 | | |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2114 | @ | 3:9150fe93bec6 added d
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2115 |/ /
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2116 o / 2:155349b645be added c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2117 |/
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2118 o 1:5f6d8a4bf34a added b
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2119 |
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2120 o 0:9092f1db7931 added a
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2121
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2122 $ 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
2123 grafting 8:637f9e9bbfd4 "added z" (tip)
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2124 grafting 7:123221671fd4 "added y"
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2125 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
2126 merging c
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2127 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
2128 abort: unresolved conflicts, can't continue
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2129 (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
2130 [255]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2131
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2132 $ cd ..
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2133 $ hg init pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2134 $ cd pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2135 $ cat >> .hg/hgrc <<EOF
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2136 > [phases]
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2137 > publish=False
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2138 > EOF
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2139 $ 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
2140 pulling from ../abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2141 requesting all changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2142 adding changesets
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2143 adding manifests
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2144 adding file changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2145 added 11 changesets with 9 changes to 8 files (+4 heads)
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 39187
diff changeset
2146 new changesets 9092f1db7931:6b98ff0062dd (6 drafts)
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2147 (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
2148 $ hg up 9
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2149 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
2150 $ echo w > w
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2151 $ 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
2152
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2153 $ cd ../abortgraft
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2154 $ hg pull ../pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2155 pulling from ../pullrepo
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2156 searching for changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2157 adding changesets
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2158 adding manifests
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2159 adding file changes
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2160 added 1 changesets with 1 changes to 1 files (+1 heads)
39480
89630d0b3e23 phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents: 39187
diff changeset
2161 new changesets 311dfc6cf3bf (1 drafts)
38453
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2162 (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
2163
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2164 $ hg graft --abort
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2165 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
2166 graft aborted
5cdfc20bfd5f graft: introduce --abort flag to abort interrupted graft
Pulkit Goyal <7895pulkit@gmail.com>
parents: 38341
diff changeset
2167 working directory is now at 6b98ff0062dd
38473
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2168
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2169 $ cd ..
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2170
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2171 ============================
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2172 Testing --no-commit option:|
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2173 ============================
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2174
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2175 $ hg init nocommit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2176 $ cd nocommit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2177 $ echo a > a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2178 $ hg ci -qAma
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2179 $ echo b > b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2180 $ hg ci -qAmb
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2181 $ hg up -q 0
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2182 $ echo c > c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2183 $ hg ci -qAmc
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2184 $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2185 @ 2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2186 |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2187 | o 1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2188 |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2189 o 0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2190
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2191
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2192 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
2193
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2194 $ hg graft 1 --no-commit -e
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2195 abort: cannot specify --no-commit and --edit together
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2196 [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2197
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2198 $ hg graft 1 --no-commit --log
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2199 abort: cannot specify --no-commit and --log together
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2200 [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2201
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2202 $ hg graft 1 --no-commit -D
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2203 abort: cannot specify --no-commit and --currentdate together
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2204 [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2205
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2206 Test --no-commit is working:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2207 $ hg graft 1 --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2208 grafting 1:d2ae7f538514 "b"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2209
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2210 $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2211 @ 2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2212 |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2213 | o 1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2214 |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2215 o 0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2216
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2217
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2218 $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2219 diff -r d36c0562f908 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2220 --- /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
2221 +++ 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
2222 @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2223 +b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2224
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2225 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
2226
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2227 $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2228 $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2229 $ hg ci -qm "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2230 $ hg up -q 1
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2231 $ echo B>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2232 $ hg ci -qm "B in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2233 $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2234 @ 4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2235 |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2236 | o 3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2237 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2238 | o 2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2239 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2240 o | 1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2241 |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2242 o 0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2243
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2244
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2245 $ hg graft 3 --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2246 grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2247 merging a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2248 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
2249 abort: unresolved conflicts, can't continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2250 (use 'hg resolve' and 'hg graft --continue')
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2251 [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2252
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2253 Resolve conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2254 $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2255 $ hg resolve --mark
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2256 (no more unresolved files)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2257 continue: hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2258
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2259 $ hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2260 grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2261 $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2262 @ 4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2263 |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2264 | o 3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2265 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2266 | o 2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2267 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2268 o | 1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2269 |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2270 o 0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2271
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2272 $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2273 diff -r 2aa9ad1006ff a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2274 --- 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
2275 +++ 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
2276 @@ -1,1 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2277 -B
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2278 +A
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2279
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2280 $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2281
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2282 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
2283
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2284 $ hg graft 3
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2285 grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2286 merging a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2287 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
2288 abort: unresolved conflicts, can't continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2289 (use 'hg resolve' and 'hg graft --continue')
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2290 [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2291
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2292 Resolve conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2293 $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2294 $ hg resolve --mark
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2295 (no more unresolved files)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2296 continue: hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2297
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2298 $ hg graft --continue --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2299 grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2300 $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2301 diff -r 2aa9ad1006ff a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2302 --- 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
2303 +++ 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
2304 @@ -1,1 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2305 -B
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2306 +A
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2307
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2308 $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2309 @ 4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2310 |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2311 | o 3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2312 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2313 | o 2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2314 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2315 o | 1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2316 |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2317 o 0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2318
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2319 $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2320
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2321 Test --no-commit when graft multiple revisions:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2322 When there is conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2323 $ hg graft -r "2::3" --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2324 grafting 2:d36c0562f908 "c"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2325 grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2326 merging a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2327 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
2328 abort: unresolved conflicts, can't continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2329 (use 'hg resolve' and 'hg graft --continue')
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2330 [255]
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2331
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2332 $ echo A>a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2333 $ hg resolve --mark
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2334 (no more unresolved files)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2335 continue: hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2336 $ hg graft --continue
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2337 grafting 3:09e253b87e17 "A in file a"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2338 $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2339 diff -r 2aa9ad1006ff a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2340 --- 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
2341 +++ 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
2342 @@ -1,1 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2343 -B
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2344 +A
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2345 diff -r 2aa9ad1006ff c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2346 --- /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
2347 +++ 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
2348 @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2349 +c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2350
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2351 $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2352 @ 4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2353 |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2354 | o 3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2355 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2356 | o 2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2357 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2358 o | 1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2359 |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2360 o 0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2361
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2362 $ hg up -qC
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2363
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2364 When there is no conflict:
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2365 $ echo d>d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2366 $ hg add d -q
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2367 $ hg ci -qmd
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2368 $ hg up 3 -q
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2369 $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2370 o 5:baefa8927fc0 d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2371 |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2372 o 4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2373 |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2374 | @ 3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2375 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2376 | o 2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2377 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2378 o | 1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2379 |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2380 o 0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2381
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2382
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2383 $ hg graft -r 1 -r 5 --no-commit
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2384 grafting 1:d2ae7f538514 "b"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2385 grafting 5:baefa8927fc0 "d" (tip)
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2386 $ hg diff
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2387 diff -r 09e253b87e17 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2388 --- /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
2389 +++ 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
2390 @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2391 +b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2392 diff -r 09e253b87e17 d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2393 --- /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
2394 +++ 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
2395 @@ -0,0 +1,1 @@
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2396 +d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2397 $ hg log -GT "{rev}:{node|short} {desc}\n"
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2398 o 5:baefa8927fc0 d
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2399 |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2400 o 4:2aa9ad1006ff B in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2401 |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2402 | @ 3:09e253b87e17 A in file a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2403 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2404 | o 2:d36c0562f908 c
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2405 | |
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2406 o | 1:d2ae7f538514 b
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2407 |/
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2408 o 0:cb9a9f314b8b a
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2409
622f79e3a1cb graft: add no-commit mode (issue5631)
Sushil khanchi <sushilkhanchi97@gmail.com>
parents: 38453
diff changeset
2410 $ cd ..