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