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