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