Mercurial > hg
annotate tests/test-graft.t @ 26749:4a82cb5c1dc8
dirstate: show develwarn for write() invocation without transaction
This is used to detect 'dirstate.write()' invocation without the value
gotten by 'repo.currenttransaction()' (mainly focused on 3rd party
extensions).
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 17 Oct 2015 01:15:34 +0900 |
parents | 8e6d5b7317e6 |
children | 296d55def9c4 |
rev | line source |
---|---|
15361 | 1 Create a repo with some stuff in it: |
2 | |
3 $ hg init a | |
4 $ cd a | |
5 $ echo a > a | |
6 $ echo a > d | |
7 $ echo a > e | |
8 $ hg ci -qAm0 | |
9 $ echo b > a | |
10 $ hg ci -m1 -u bar | |
11 $ hg mv a b | |
12 $ hg ci -m2 | |
13 $ hg cp b c | |
14 $ hg ci -m3 -u baz | |
15 $ echo b > d | |
16 $ echo f > e | |
17 $ hg ci -m4 | |
18 $ hg up -q 3 | |
19 $ echo b > e | |
20 $ hg branch -q stable | |
21 $ hg ci -m5 | |
22 $ hg merge -q default --tool internal:local | |
23 $ hg branch -q default | |
24 $ 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
|
25 $ 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
|
26 $ 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
|
27 |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
19893
diff
changeset
|
28 $ 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
|
29 @ 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
|
30 |\ |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
31 | 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
|
32 | | |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
33 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
|
34 |/ |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
35 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
|
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@2.public: 2 |
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 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
|
40 | |
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
41 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
|
42 |
15361 | 43 |
44 Need to specify a rev: | |
45 | |
46 $ hg graft | |
47 abort: no revisions specified | |
48 [255] | |
49 | |
50 Can't graft ancestor: | |
51 | |
52 $ hg graft 1 2 | |
23507
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
53 skipping ancestor revision 1:5d205f8b35b6 |
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
54 skipping ancestor revision 2:5c095ad7e90f |
15361 | 55 [255] |
56 | |
16992
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
57 Specify revisions with -r: |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
58 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
59 $ hg graft -r 1 -r 2 |
23507
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
60 skipping ancestor revision 1:5d205f8b35b6 |
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
61 skipping ancestor revision 2:5c095ad7e90f |
16992
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
62 [255] |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
63 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
64 $ hg graft -r 1 2 |
23507
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
65 skipping ancestor revision 2:5c095ad7e90f |
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
66 skipping ancestor revision 1:5d205f8b35b6 |
16992
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
67 [255] |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
68 |
15361 | 69 Can't graft with dirty wd: |
70 | |
71 $ hg up -q 0 | |
72 $ echo foo > a | |
73 $ hg graft 1 | |
19804
061ce98c888d
cmdutil.bailifchanged: standardize error message for dirty working dir
Siddharth Agarwal <sid0@fb.com>
parents:
19476
diff
changeset
|
74 abort: uncommitted changes |
15361 | 75 [255] |
76 $ hg revert a | |
77 | |
78 Graft a rename: | |
21416
3e717c9376fc
graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21391
diff
changeset
|
79 (this also tests that editor is invoked if '--edit' is specified) |
15361 | 80 |
21416
3e717c9376fc
graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21391
diff
changeset
|
81 $ 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
|
82 A b |
3e717c9376fc
graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21391
diff
changeset
|
83 R a |
3e717c9376fc
graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21391
diff
changeset
|
84 $ HGEDITOR=cat hg graft 2 -u foo --edit |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
85 grafting 2:5c095ad7e90f "2" |
15361 | 86 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
|
87 2 |
3e717c9376fc
graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21391
diff
changeset
|
88 |
3e717c9376fc
graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21391
diff
changeset
|
89 |
3e717c9376fc
graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21391
diff
changeset
|
90 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
|
91 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
|
92 HG: -- |
3e717c9376fc
graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21391
diff
changeset
|
93 HG: user: foo |
3e717c9376fc
graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21391
diff
changeset
|
94 HG: branch 'default' |
22897
8fe74328f700
dirstate: merge falls through to otherparent
Matt Mackall <mpm@selenic.com>
parents:
22305
diff
changeset
|
95 HG: added b |
21416
3e717c9376fc
graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21391
diff
changeset
|
96 HG: removed a |
15361 | 97 $ hg export tip --git |
98 # HG changeset patch | |
99 # User foo | |
100 # Date 0 0 | |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
18631
diff
changeset
|
101 # 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
|
102 # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82 |
15361 | 103 # Parent 68795b066622ca79a25816a662041d8f78f3cd9e |
104 2 | |
105 | |
106 diff --git a/a b/b | |
107 rename from a | |
108 rename to b | |
109 | |
110 Look for extra:source | |
111 | |
112 $ 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
|
113 changeset: 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82 |
15361 | 114 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
|
115 phase: draft |
15361 | 116 parent: 0:68795b066622ca79a25816a662041d8f78f3cd9e |
117 parent: -1:0000000000000000000000000000000000000000 | |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
118 manifest: 7:e59b6b228f9cbf9903d5e9abf996e083a1f533eb |
15361 | 119 user: foo |
120 date: Thu Jan 01 00:00:00 1970 +0000 | |
121 files+: b | |
122 files-: a | |
123 extra: branch=default | |
124 extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4 | |
125 description: | |
126 2 | |
127 | |
128 | |
129 | |
130 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
|
131 (this also tests that editor is not invoked if '--edit' is not specified) |
15361 | 132 |
16389
79fecd735d26
graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents:
16094
diff
changeset
|
133 $ 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
|
134 skipping ungraftable merge revision 6 |
23507
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
135 skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
136 grafting 1:5d205f8b35b6 "1" |
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
137 grafting 5:97f8bfe72746 "5" |
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
138 grafting 4:9c233e8e184d "4" |
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
139 grafting 3:4c60f11aa304 "3" |
16389
79fecd735d26
graft: add --dry-run support (issue3362)
Matt Mackall <mpm@selenic.com>
parents:
16094
diff
changeset
|
140 |
21416
3e717c9376fc
graft: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents:
21391
diff
changeset
|
141 $ HGEDITOR=cat hg graft 1 5 4 3 'merge()' 2 --debug |
15361 | 142 skipping ungraftable merge revision 6 |
143 scanning for duplicate grafts | |
23507
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
144 skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
145 grafting 1:5d205f8b35b6 "1" |
15361 | 146 searching for copies back to rev 1 |
147 unmatched files in local: | |
148 b | |
16795
e9ae770eff1c
merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16660
diff
changeset
|
149 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
|
150 src: 'a' -> dst: 'b' * |
15361 | 151 checking for directory renames |
152 resolving manifests | |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
153 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
|
154 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
|
155 preserving b for resolve of b |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
156 b: local copied/moved from a -> m (premerge) |
26517
d8463a743d7d
filemerge: normalize 'internal:foo' names to ':foo'
Siddharth Agarwal <sid0@fb.com>
parents:
26229
diff
changeset
|
157 picked tool ':merge' for b (binary False symlink False) |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
158 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
|
159 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
|
160 premerge successful |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23514
diff
changeset
|
161 committing files: |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
162 b |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23514
diff
changeset
|
163 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23514
diff
changeset
|
164 committing changelog |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
165 grafting 5:97f8bfe72746 "5" |
15361 | 166 searching for copies back to rev 1 |
167 resolving manifests | |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
168 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
|
169 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
21389
e741972017d9
merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
21267
diff
changeset
|
170 e: remote is newer -> g |
18631
e2dc5397bc82
tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents:
18605
diff
changeset
|
171 getting e |
23482
208ec8ca7c79
merge: make 'keep' message more descriptive
Martin von Zweigbergk <martinvonz@google.com>
parents:
23463
diff
changeset
|
172 b: remote unchanged -> k |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23514
diff
changeset
|
173 committing files: |
15361 | 174 e |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23514
diff
changeset
|
175 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23514
diff
changeset
|
176 committing changelog |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
177 grafting 4:9c233e8e184d "4" |
15361 | 178 searching for copies back to rev 1 |
179 resolving manifests | |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
180 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
|
181 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
|
182 preserving e for resolve of e |
21389
e741972017d9
merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
21267
diff
changeset
|
183 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
|
184 getting d |
23482
208ec8ca7c79
merge: make 'keep' message more descriptive
Martin von Zweigbergk <martinvonz@google.com>
parents:
23463
diff
changeset
|
185 b: remote unchanged -> k |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
186 e: versions differ -> m (premerge) |
26517
d8463a743d7d
filemerge: normalize 'internal:foo' names to ':foo'
Siddharth Agarwal <sid0@fb.com>
parents:
26229
diff
changeset
|
187 picked tool ':merge' for e (binary False symlink False) |
15361 | 188 merging e |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
189 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26614
diff
changeset
|
190 e: versions differ -> m (merge) |
26611
a5ff66e6d77a
filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents:
26517
diff
changeset
|
191 picked tool ':merge' for e (binary False symlink False) |
a5ff66e6d77a
filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents:
26517
diff
changeset
|
192 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622 |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
193 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
15361 | 194 abort: unresolved conflicts, can't continue |
195 (use hg resolve and hg graft --continue) | |
196 [255] | |
197 | |
19253
e078ea9b4ce4
graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents:
18648
diff
changeset
|
198 Commit while interrupted should fail: |
e078ea9b4ce4
graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents:
18648
diff
changeset
|
199 |
e078ea9b4ce4
graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents:
18648
diff
changeset
|
200 $ hg ci -m 'commit interrupted graft' |
19476
4fed15d4c5aa
commands: add checks for unfinished operations (issue3955)
Matt Mackall <mpm@selenic.com>
parents:
19332
diff
changeset
|
201 abort: graft in progress |
4fed15d4c5aa
commands: add checks for unfinished operations (issue3955)
Matt Mackall <mpm@selenic.com>
parents:
19332
diff
changeset
|
202 (use 'hg graft --continue' or 'hg update' to abort) |
19253
e078ea9b4ce4
graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents:
18648
diff
changeset
|
203 [255] |
e078ea9b4ce4
graft: refuse to commit an interrupted graft (issue3667)
Simon King <simon@simonking.org.uk>
parents:
18648
diff
changeset
|
204 |
19332
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
205 Abort the graft and try committing: |
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
206 |
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
207 $ hg up -C . |
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
208 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
|
209 $ echo c >> e |
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
210 $ hg ci -mtest |
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
211 |
23514
3575f42e1b7b
test-graft: use strip extension instead of mq extension
Augie Fackler <raf@durin42.com>
parents:
23508
diff
changeset
|
212 $ hg strip . --config extensions.strip= |
19332
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
213 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
|
214 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
|
215 |
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
216 Graft again: |
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
217 |
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
218 $ 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
|
219 skipping ungraftable merge revision 6 |
23507
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
220 skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) |
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
221 skipping revision 1:5d205f8b35b6 (already grafted to 8:6b9e5368ca4e) |
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
222 skipping revision 5:97f8bfe72746 (already grafted to 9:1905859650ec) |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
223 grafting 4:9c233e8e184d "4" |
19332
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
224 merging e |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
225 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
19332
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
226 abort: unresolved conflicts, can't continue |
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
227 (use hg resolve and hg graft --continue) |
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
228 [255] |
0af993732f66
update: remove .hg/graftstate on clean (issue3970)
Siddharth Agarwal <sid0@fb.com>
parents:
19253
diff
changeset
|
229 |
15361 | 230 Continue without resolve should fail: |
231 | |
232 $ hg graft -c | |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
233 grafting 4:9c233e8e184d "4" |
23917
3cbb5bf4035d
messages: quote "hg help" hints consistently
Wagner Bruna <wbruna@yahoo.com>
parents:
23835
diff
changeset
|
234 abort: unresolved merge conflicts (see "hg help resolve") |
15361 | 235 [255] |
236 | |
237 Fix up: | |
238 | |
239 $ echo b > e | |
240 $ 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
|
241 (no more unresolved files) |
15361 | 242 |
243 Continue with a revision should fail: | |
244 | |
245 $ hg graft -c 6 | |
246 abort: can't specify --continue and revisions | |
247 [255] | |
248 | |
16992
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
249 $ hg graft -c -r 6 |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
250 abort: can't specify --continue and revisions |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
251 [255] |
55e7f352b1d3
graft: allow -r to specify revisions
Thomas Arendsen Hein <thomas@intevation.de>
parents:
16913
diff
changeset
|
252 |
15361 | 253 Continue for real, clobber usernames |
254 | |
255 $ hg graft -c -U | |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
256 grafting 4:9c233e8e184d "4" |
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
257 grafting 3:4c60f11aa304 "3" |
15361 | 258 |
259 Compare with original: | |
260 | |
261 $ hg diff -r 6 | |
262 $ hg status --rev 0:. -C | |
263 M d | |
264 M e | |
265 A b | |
266 a | |
267 A c | |
268 a | |
269 R a | |
270 | |
271 View graph: | |
272 | |
20117
aa9385f983fa
tests: don't load unnecessary graphlog extension
Martin Geisler <martin@geisler.net>
parents:
19893
diff
changeset
|
273 $ 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
|
274 @ test@11.draft: 3 |
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
275 | |
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
276 o test@10.draft: 4 |
15361 | 277 | |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
278 o test@9.draft: 5 |
15361 | 279 | |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
280 o bar@8.draft: 1 |
15361 | 281 | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
282 o foo@7.draft: 2 |
15361 | 283 | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
284 | o test@6.secret: 6 |
15361 | 285 | |\ |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
286 | | o test@5.draft: 5 |
15361 | 287 | | | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
288 | o | test@4.draft: 4 |
15361 | 289 | |/ |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
290 | o baz@3.public: 3 |
15361 | 291 | | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
292 | o test@2.public: 2 |
15361 | 293 | | |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
294 | o bar@1.public: 1 |
15361 | 295 |/ |
15918
4f9853e7f690
graft: add test to check the phase of new changesets
Alain Leufroy <alain.leufroy@logilab.fr>
parents:
15907
diff
changeset
|
296 o test@0.public: 0 |
15361 | 297 |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
298 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
|
299 $ hg up -q 0 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
300 $ echo 'g'>g |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
301 $ hg add g |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
302 $ hg ci -m 7 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
303 created new head |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
304 $ hg graft 7 |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
305 grafting 7:ef0ef43d49e7 "2" |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
306 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
307 $ 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
|
308 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82 |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
309 $ 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
|
310 2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
311 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
312 $ hg log --debug -r tip |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
313 changeset: 13:7a4785234d87ec1aa420ed6b11afe40fa73e12a9 |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
314 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
|
315 phase: draft |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
316 parent: 12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
317 parent: -1:0000000000000000000000000000000000000000 |
16601
0c98820be15c
filectx: handle some other simple cases for finding merge ancestor
Matt Mackall <mpm@selenic.com>
parents:
16600
diff
changeset
|
318 manifest: 13:dc313617b8c32457c0d589e0dbbedfe71f3cd637 |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
319 user: foo |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
320 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
|
321 files+: b |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
322 files-: a |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
323 extra: branch=default |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
324 extra: intermediate-source=ef0ef43d49e79e81ddafdc7997401ba0041efc82 |
15506
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
325 extra: source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
326 description: |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
327 2 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
328 |
dc9fb7015d7f
graft: preserve original source in subsequent grafts
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15361
diff
changeset
|
329 |
15508
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
330 Disallow grafting an already grafted cset onto its original branch |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
331 $ hg up -q 6 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
332 $ hg graft 7 |
23507
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
333 skipping already grafted revision 7:ef0ef43d49e7 (was grafted from 2:5c095ad7e90f) |
15508
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
334 [255] |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
335 |
26228
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
336 $ hg extdiff --config extensions.extdiff= --patch -r 2 -r 13 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
337 --- */hg-5c095ad7e90f.patch * +0000 (glob) |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
338 +++ */hg-7a4785234d87.patch * +0000 (glob) |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
339 @@ -1,18 +1,18 @@ |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
340 # HG changeset patch |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
341 -# User test |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
342 +# User foo |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
343 # Date 0 0 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
344 # Thu Jan 01 00:00:00 1970 +0000 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
345 -# Node ID 5c095ad7e90f871700f02dd1fa5012cb4498a2d4 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
346 -# Parent 5d205f8b35b66bc36375c9534ffd3237730e8f04 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
347 +# Node ID 7a4785234d87ec1aa420ed6b11afe40fa73e12a9 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
348 +# Parent b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
349 2 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
350 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
351 -diff -r 5d205f8b35b6 -r 5c095ad7e90f a |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
352 +diff -r b592ea63bb0c -r 7a4785234d87 a |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
353 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
354 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
355 @@ -1,1 +0,0 @@ |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
356 --b |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
357 -diff -r 5d205f8b35b6 -r 5c095ad7e90f b |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
358 +-a |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
359 +diff -r b592ea63bb0c -r 7a4785234d87 b |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
360 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
361 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
362 @@ -0,0 +1,1 @@ |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
363 -+b |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
364 ++a |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
365 [1] |
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
366 |
26229
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
367 $ hg extdiff --config extensions.extdiff= --patch -r 2 -r 13 -X . |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
368 --- */hg-5c095ad7e90f.patch * +0000 (glob) |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
369 +++ */hg-7a4785234d87.patch * +0000 (glob) |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
370 @@ -1,8 +1,8 @@ |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
371 # HG changeset patch |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
372 -# User test |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
373 +# User foo |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
374 # Date 0 0 |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
375 # Thu Jan 01 00:00:00 1970 +0000 |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
376 -# Node ID 5c095ad7e90f871700f02dd1fa5012cb4498a2d4 |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
377 -# Parent 5d205f8b35b66bc36375c9534ffd3237730e8f04 |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
378 +# Node ID 7a4785234d87ec1aa420ed6b11afe40fa73e12a9 |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
379 +# Parent b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
380 2 |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
381 |
d1530c6e8613
extdiff: enable -I/-X with --patch
Matt Harbison <matt_harbison@yahoo.com>
parents:
26228
diff
changeset
|
382 [1] |
26228
0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
Matt Harbison <matt_harbison@yahoo.com>
parents:
25589
diff
changeset
|
383 |
15508
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
384 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
|
385 $ hg up -q 13 |
15508
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
386 $ hg graft 2 |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
387 skipping revision 2:5c095ad7e90f (already grafted to 13:7a4785234d87) |
15508
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
388 [255] |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
389 $ hg graft 7 |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
390 skipping already grafted revision 7:ef0ef43d49e7 (13:7a4785234d87 also has origin 2:5c095ad7e90f) |
15508
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
391 [255] |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
392 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
393 $ hg up -q 7 |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
394 $ hg graft 2 |
23507
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
395 skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7) |
15508
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
396 [255] |
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
397 $ hg graft tip |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
398 skipping already grafted revision 13:7a4785234d87 (7:ef0ef43d49e7 also has origin 2:5c095ad7e90f) |
15508
00276525e2b7
graft: disallow grafting grafted csets in specific situations (issue3091)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
15507
diff
changeset
|
399 [255] |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
400 |
16660
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
401 Graft with --log |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
402 |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
403 $ hg up -Cq 1 |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
404 $ hg graft 3 --log -u foo |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
405 grafting 3:4c60f11aa304 "3" |
16660
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
406 warning: can't find ancestor for 'c' copied from 'b'! |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
407 $ hg log --template '{rev} {parents} {desc}\n' -r tip |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
408 14 1:5d205f8b35b6 3 |
2a71cc53f244
graft: implement --log (issue3438)
Levi Bard <levi@unity3d.com>
parents:
16601
diff
changeset
|
409 (grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8) |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16795
diff
changeset
|
410 |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
411 Resolve conflicted graft |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
412 $ 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
|
413 $ echo b > a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
414 $ 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
|
415 created new head |
23463
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
416 $ echo c > a |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
417 $ 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
|
418 $ hg graft 1 --tool internal:fail |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
419 grafting 1:5d205f8b35b6 "1" |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
420 abort: unresolved conflicts, can't continue |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
421 (use hg resolve and hg graft --continue) |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
422 [255] |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
423 $ hg resolve --all |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
424 merging a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
425 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
|
426 [1] |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
427 $ cat a |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
428 <<<<<<< local: aaa4406d4f0a - test: 9 |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
429 c |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
430 ======= |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
431 b |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
432 >>>>>>> other: 5d205f8b35b6 - bar: 1 |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
433 $ echo b > a |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
434 $ 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
|
435 (no more unresolved files) |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
436 $ hg graft -c |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
437 grafting 1:5d205f8b35b6 "1" |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
438 $ 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
|
439 # HG changeset patch |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
440 # User bar |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
441 # Date 0 0 |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
18631
diff
changeset
|
442 # 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
|
443 # Node ID f67661df0c4804d301f064f332b57e7d5ddaf2be |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
444 # Parent aaa4406d4f0ae9befd6e58c82ec63706460cbca6 |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
445 1 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
446 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
447 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
|
448 --- a/a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
449 +++ b/a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
450 @@ -1,1 +1,1 @@ |
23463
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
451 -c |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
452 +b |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
453 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
454 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
|
455 $ echo c > a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
456 $ 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
|
457 $ hg graft 2 --tool internal:fail |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
458 grafting 2:5c095ad7e90f "2" |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
459 abort: unresolved conflicts, can't continue |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
460 (use hg resolve and hg graft --continue) |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
461 [255] |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
462 $ hg resolve --all |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
463 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
|
464 (no more unresolved files) |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
465 $ hg graft -c |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
466 grafting 2:5c095ad7e90f "2" |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
467 $ 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
|
468 # HG changeset patch |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
469 # User test |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
470 # Date 0 0 |
18648
76b69cccb07a
export: show 'Date' header in a format that also is readable for humans
Mads Kiilerich <mads@kiilerich.com>
parents:
18631
diff
changeset
|
471 # 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
|
472 # Node ID 9627f653b421c61fc1ea4c4e366745070fa3d2bc |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
473 # Parent ee295f490a40b97f3d18dd4c4f1c8936c233b612 |
17045
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
474 2 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
475 |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
476 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
|
477 rename from a |
52ea9ce5b641
graft: don't drop the second parent on unsuccessful merge (issue3498)
Yuya Nishihara <yuya@tcha.org>
parents:
16509
diff
changeset
|
478 rename to b |
17185
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
479 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
480 Test simple origin(), with and without args |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
481 $ hg log -r 'origin()' |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
482 changeset: 1:5d205f8b35b6 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
483 user: bar |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
484 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
485 summary: 1 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
486 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
487 changeset: 2:5c095ad7e90f |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
488 user: test |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
489 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
490 summary: 2 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
491 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
492 changeset: 3:4c60f11aa304 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
493 user: baz |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
494 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
495 summary: 3 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
496 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
497 changeset: 4:9c233e8e184d |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
498 user: test |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
499 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
500 summary: 4 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
501 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
502 changeset: 5:97f8bfe72746 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
503 branch: stable |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
504 parent: 3:4c60f11aa304 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
505 user: test |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
506 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
507 summary: 5 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
508 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
509 $ hg log -r 'origin(7)' |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
510 changeset: 2:5c095ad7e90f |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
511 user: test |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
512 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
513 summary: 2 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
514 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
515 Now transplant a graft to test following through copies |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
516 $ hg up -q 0 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
517 $ hg branch -q dev |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
518 $ hg ci -qm "dev branch" |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
519 $ hg --config extensions.transplant= transplant -q 7 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
520 $ hg log -r 'origin(.)' |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
521 changeset: 2:5c095ad7e90f |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
522 user: test |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
523 date: Thu Jan 01 00:00:00 1970 +0000 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
524 summary: 2 |
2c7c4824969e
revset: add origin() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17059
diff
changeset
|
525 |
21765
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
526 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
|
527 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
|
528 tests. |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
529 $ 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
|
530 |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
531 The graft case |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
532 $ 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
|
533 7: 7ae846e9111fc8f57745634250c7b9ac0a60689b |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
534 branch=default |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
535 convert_revision=ef0ef43d49e79e81ddafdc7997401ba0041efc82 |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
536 source=e0213322b2c1a5d5d236c74e79666441bee67a7d |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
537 $ 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
|
538 changeset: 2:e0213322b2c1 |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
539 user: test |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
540 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
|
541 summary: 2 |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
542 |
25589
273d94255e1e
convert: update 'intermediate-source' in the destination's extras dictionary
Matt Harbison <matt_harbison@yahoo.com>
parents:
25125
diff
changeset
|
543 Test that template correctly expands more than one 'extra' (issue4362), and that |
273d94255e1e
convert: update 'intermediate-source' in the destination's extras dictionary
Matt Harbison <matt_harbison@yahoo.com>
parents:
25125
diff
changeset
|
544 'intermediate-source' is converted. |
273d94255e1e
convert: update 'intermediate-source' in the destination's extras dictionary
Matt Harbison <matt_harbison@yahoo.com>
parents:
25125
diff
changeset
|
545 $ 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
|
546 Extra: branch=default |
25589
273d94255e1e
convert: update 'intermediate-source' in the destination's extras dictionary
Matt Harbison <matt_harbison@yahoo.com>
parents:
25125
diff
changeset
|
547 Extra: convert_revision=7a4785234d87ec1aa420ed6b11afe40fa73e12a9 |
273d94255e1e
convert: update 'intermediate-source' in the destination's extras dictionary
Matt Harbison <matt_harbison@yahoo.com>
parents:
25125
diff
changeset
|
548 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
|
549 Extra: source=e0213322b2c1a5d5d236c74e79666441bee67a7d |
a3c2d9211294
templater: don't overwrite the keyword mapping in runsymbol() (issue4362)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22897
diff
changeset
|
550 |
21765
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
551 The transplant case |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
552 $ 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
|
553 21: fbb6c5cc81002f2b4b49c9d731404688bcae5ade |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
554 branch=dev |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
555 convert_revision=7e61b508e709a11d28194a5359bc3532d910af21 |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
556 transplant_source=z\xe8F\xe9\x11\x1f\xc8\xf5wEcBP\xc7\xb9\xac (esc) |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
557 `h\x9b (esc) |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
558 $ 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
|
559 changeset: 2:e0213322b2c1 |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
560 user: test |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
561 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
|
562 summary: 2 |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
563 |
44255f7ce886
convert: update the transplant, rebase and graft references in 'extra'
Matt Harbison <matt_harbison@yahoo.com>
parents:
21416
diff
changeset
|
564 |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
565 Test simple destination |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
566 $ hg log -r 'destination()' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
567 changeset: 7:ef0ef43d49e7 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
568 parent: 0:68795b066622 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
569 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
570 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
571 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
572 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
573 changeset: 8:6b9e5368ca4e |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
574 user: bar |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
575 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
576 summary: 1 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
577 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
578 changeset: 9:1905859650ec |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
579 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
580 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
581 summary: 5 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
582 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
583 changeset: 10:52dc0b4c6907 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
584 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
585 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
586 summary: 4 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
587 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
588 changeset: 11:882b35362a6b |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
589 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
590 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
591 summary: 3 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
592 |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
593 changeset: 13:7a4785234d87 |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
594 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
595 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
596 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
597 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
598 changeset: 14:f64defefacee |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
599 parent: 1:5d205f8b35b6 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
600 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
601 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
602 summary: 3 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
603 |
23463
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
604 changeset: 17:f67661df0c48 |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
605 user: bar |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
606 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
607 summary: 1 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
608 |
23463
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
609 changeset: 19:9627f653b421 |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
610 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
611 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
612 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
613 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
614 changeset: 21:7e61b508e709 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
615 branch: dev |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
616 tag: tip |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
617 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
618 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
619 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
620 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
621 $ hg log -r 'destination(2)' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
622 changeset: 7:ef0ef43d49e7 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
623 parent: 0:68795b066622 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
624 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
625 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
626 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
627 |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
628 changeset: 13:7a4785234d87 |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
629 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
630 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
631 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
632 |
23463
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
633 changeset: 19:9627f653b421 |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
634 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
635 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
636 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
637 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
638 changeset: 21:7e61b508e709 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
639 branch: dev |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
640 tag: tip |
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 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
645 Transplants of grafts can find a destination... |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
646 $ hg log -r 'destination(7)' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
647 changeset: 21:7e61b508e709 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
648 branch: dev |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
649 tag: tip |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
650 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
651 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
652 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
653 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
654 ... grafts of grafts unfortunately can't |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
655 $ hg graft -q 13 |
23929
a43fdf33a6be
commit: remove reverse search for copy source when not in parent (issue4476)
Ryan McElroy <rmcelroy@fb.com>
parents:
23917
diff
changeset
|
656 warning: can't find ancestor for 'b' copied from 'a'! |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
657 $ hg log -r 'destination(13)' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
658 All copies of a cset |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
659 $ hg log -r 'origin(13) or destination(origin(13))' |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
660 changeset: 2:5c095ad7e90f |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
661 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
662 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
663 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
664 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
665 changeset: 7:ef0ef43d49e7 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
666 parent: 0:68795b066622 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
667 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
668 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
669 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
670 |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
671 changeset: 13:7a4785234d87 |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
672 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
673 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
674 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
675 |
23463
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
676 changeset: 19:9627f653b421 |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
677 user: test |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
678 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
679 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
680 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
681 changeset: 21:7e61b508e709 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
682 branch: dev |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
683 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
684 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
685 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
686 |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
687 changeset: 22:d1cb6591fa4b |
17186
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
688 branch: dev |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
689 tag: tip |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
690 user: foo |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
691 date: Thu Jan 01 00:00:00 1970 +0000 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
692 summary: 2 |
a3da6f298592
revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents:
17185
diff
changeset
|
693 |
21200
a1381eea7c7d
graft: do not use `.remove` on a smart set (regression)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21082
diff
changeset
|
694 |
a1381eea7c7d
graft: do not use `.remove` on a smart set (regression)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21082
diff
changeset
|
695 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
|
696 |
a1381eea7c7d
graft: do not use `.remove` on a smart set (regression)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21082
diff
changeset
|
697 $ hg graft 'origin(13) or destination(origin(13))' |
23507
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
698 skipping ancestor revision 21:7e61b508e709 |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
699 skipping ancestor revision 22:d1cb6591fa4b |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
700 skipping revision 2:5c095ad7e90f (already grafted to 22:d1cb6591fa4b) |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
701 grafting 7:ef0ef43d49e7 "2" |
23929
a43fdf33a6be
commit: remove reverse search for copy source when not in parent (issue4476)
Ryan McElroy <rmcelroy@fb.com>
parents:
23917
diff
changeset
|
702 warning: can't find ancestor for 'b' copied from 'a'! |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
703 grafting 13:7a4785234d87 "2" |
23929
a43fdf33a6be
commit: remove reverse search for copy source when not in parent (issue4476)
Ryan McElroy <rmcelroy@fb.com>
parents:
23917
diff
changeset
|
704 warning: can't find ancestor for 'b' copied from 'a'! |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
705 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
|
706 merging b |
23929
a43fdf33a6be
commit: remove reverse search for copy source when not in parent (issue4476)
Ryan McElroy <rmcelroy@fb.com>
parents:
23917
diff
changeset
|
707 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
|
708 |
21979
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
709 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
|
710 |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
711 $ hg graft 19 0 6 |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
712 skipping ungraftable merge revision 6 |
23507
67045b5a903a
graft: show hashes in user-facing messages
Mads Kiilerich <madski@unity3d.com>
parents:
23506
diff
changeset
|
713 skipping ancestor revision 0:68795b066622 |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
714 skipping already grafted revision 19:9627f653b421 (22:d1cb6591fa4b also has origin 2:5c095ad7e90f) |
21979
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
715 [255] |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
716 $ hg graft 19 0 6 --force |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
717 skipping ungraftable merge revision 6 |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
718 grafting 19:9627f653b421 "2" |
21979
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
719 merging b |
23929
a43fdf33a6be
commit: remove reverse search for copy source when not in parent (issue4476)
Ryan McElroy <rmcelroy@fb.com>
parents:
23917
diff
changeset
|
720 warning: can't find ancestor for 'b' copied from 'a'! |
23505
bd5dbb8a05c8
graft: show more useful status information while grafting
Mads Kiilerich <madski@unity3d.com>
parents:
23504
diff
changeset
|
721 grafting 0:68795b066622 "0" |
21979
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
722 |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
723 graft --force after backout |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
724 |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
725 $ echo abc > a |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
726 $ hg ci -m 28 |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
727 $ hg backout 28 |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
728 reverting a |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
729 changeset 29:53177ba928f6 backs out changeset 28:50a516bb8b57 |
21979
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
730 $ hg graft 28 |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
731 skipping ancestor revision 28:50a516bb8b57 |
21979
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
732 [255] |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
733 $ hg graft 28 --force |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
734 grafting 28:50a516bb8b57 "28" |
21979
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
735 merging a |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
736 $ cat a |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
737 abc |
c2863cfe8a8a
graft: allow regrafting ancestors with --force (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21947
diff
changeset
|
738 |
21980
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
739 graft --continue after --force |
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
740 |
23463
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
741 $ echo def > a |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
742 $ hg ci -m 31 |
21980
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
743 $ hg graft 28 --force --tool internal:fail |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
744 grafting 28:50a516bb8b57 "28" |
21980
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
745 abort: unresolved conflicts, can't continue |
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
746 (use hg resolve and hg graft --continue) |
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
747 [255] |
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
748 $ hg resolve --all |
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
749 merging a |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
750 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
|
751 [1] |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
752 $ echo abc > a |
bb0143e12f35
graft: use a real conflict for the tests
Martin von Zweigbergk <martinvonz@google.com>
parents:
23167
diff
changeset
|
753 $ hg resolve -m a |
21980
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
754 (no more unresolved files) |
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
755 $ hg graft -c |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
756 grafting 28:50a516bb8b57 "28" |
21980
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
757 $ cat a |
f4e5753745e9
graft: make --force apply across continues (issue3220)
Siddharth Agarwal <sid0@fb.com>
parents:
21979
diff
changeset
|
758 abc |
22302
9472284df4eb
graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
759 |
9472284df4eb
graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
760 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
|
761 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
|
762 |
9472284df4eb
graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
763 $ hg up -qC 7 |
9472284df4eb
graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
764 $ hg tag -l -r 13 tmp |
23514
3575f42e1b7b
test-graft: use strip extension instead of mq extension
Augie Fackler <raf@durin42.com>
parents:
23508
diff
changeset
|
765 $ hg --config extensions.strip= strip 2 |
23835
aa4a1672583e
bundles: do not overwrite existing backup bundles (BC)
Durham Goode <durham@fb.com>
parents:
23749
diff
changeset
|
766 saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg (glob) |
22302
9472284df4eb
graft: fix collision detection with origin revisions that are missing
Mads Kiilerich <madski@unity3d.com>
parents:
21947
diff
changeset
|
767 $ hg graft tmp |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
768 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
|
769 [255] |
23504
e172a1f2b5bb
tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents:
23482
diff
changeset
|
770 |
e172a1f2b5bb
tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents:
23482
diff
changeset
|
771 Empty graft |
e172a1f2b5bb
tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents:
23482
diff
changeset
|
772 |
e172a1f2b5bb
tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents:
23482
diff
changeset
|
773 $ hg up -qr 26 |
e172a1f2b5bb
tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents:
23482
diff
changeset
|
774 $ hg tag -f something |
e172a1f2b5bb
tests: test coverage for empty graft
Mads Kiilerich <madski@unity3d.com>
parents:
23482
diff
changeset
|
775 $ hg graft -qr 27 |
23508
2164226a5637
graft: drop cset description from empty commit message
Matt Mackall <mpm@selenic.com>
parents:
23507
diff
changeset
|
776 $ hg graft -f 27 |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
777 grafting 27:ed6c7e54e319 "28" |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
778 note: graft of 27:ed6c7e54e319 created no changes to commit |
24643
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
779 |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
780 $ cd .. |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
781 |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
782 Graft to duplicate a commit |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
783 |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
784 $ hg init graftsibling |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
785 $ cd graftsibling |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
786 $ touch a |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
787 $ hg commit -qAm a |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
788 $ touch b |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
789 $ hg commit -qAm b |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
790 $ hg log -G -T '{rev}\n' |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
791 @ 1 |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
792 | |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
793 o 0 |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
794 |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
795 $ hg up -q 0 |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
796 $ hg graft -r 1 |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
797 grafting 1:0e067c57feba "b" (tip) |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
798 $ hg log -G -T '{rev}\n' |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
799 @ 2 |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
800 | |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
801 | o 1 |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
802 |/ |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
803 o 0 |
a8e6897dffbe
graft: allow creating sibling grafts
Durham Goode <durham@fb.com>
parents:
23929
diff
changeset
|
804 |
24644
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
805 Graft to duplicate a commit twice |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
806 |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
807 $ hg up -q 0 |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
808 $ hg graft -r 2 |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
809 grafting 2:044ec77f6389 "b" (tip) |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
810 $ hg log -G -T '{rev}\n' |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
811 @ 3 |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
812 | |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
813 | o 2 |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
814 |/ |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
815 | o 1 |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
816 |/ |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
817 o 0 |
51930a7180bd
graft: record intermediate grafts in extras
Durham Goode <durham@fb.com>
parents:
24643
diff
changeset
|
818 |