Mercurial > hg

comparison tests/test-graft.t @ 16601:0c98820be15c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filectx: handle some other simple cases for finding merge ancestor
author Matt Mackall <mpm@selenic.com>
date Sun, 06 May 2012 14:20:53 -0500
parents b54f3c502e63
children 2a71cc53f244
comparison
equal deleted inserted replaced
16600:b54f3c502e63 16601:0c98820be15c
70 merging a and b to b 70 merging a and b to b
71 $ hg export tip --git 71 $ hg export tip --git
72 # HG changeset patch 72 # HG changeset patch
73 # User foo 73 # User foo
74 # Date 0 0 74 # Date 0 0
75 # Node ID d2e44c99fd3f31c176ea4efb9eca9f6306c81756 75 # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82
76 # Parent 68795b066622ca79a25816a662041d8f78f3cd9e 76 # Parent 68795b066622ca79a25816a662041d8f78f3cd9e
77 2 77 2
78 78
79 diff --git a/a b/b 79 diff --git a/a b/b
80 rename from a 80 rename from a
81 rename to b 81 rename to b
82 --- a/a
83 +++ b/b
84 @@ -1,1 +1,1 @@
85 -a
86 +b
87 82
88 Look for extra:source 83 Look for extra:source
89 84
90 $ hg log --debug -r tip 85 $ hg log --debug -r tip
91 changeset: 7:d2e44c99fd3f31c176ea4efb9eca9f6306c81756 86 changeset: 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
92 tag: tip 87 tag: tip
93 phase: draft 88 phase: draft
94 parent: 0:68795b066622ca79a25816a662041d8f78f3cd9e 89 parent: 0:68795b066622ca79a25816a662041d8f78f3cd9e
95 parent: -1:0000000000000000000000000000000000000000 90 parent: -1:0000000000000000000000000000000000000000
96 manifest: 7:5d59766436fd8fbcd38e7bebef0f6eaf3eebe637 91 manifest: 7:e59b6b228f9cbf9903d5e9abf996e083a1f533eb
97 user: foo 92 user: foo
98 date: Thu Jan 01 00:00:00 1970 +0000 93 date: Thu Jan 01 00:00:00 1970 +0000
99 files+: b 94 files+: b
100 files-: a 95 files-: a
101 extra: branch=default 96 extra: branch=default
126 all copies found (* = to merge, ! = divergent): 121 all copies found (* = to merge, ! = divergent):
127 b -> a * 122 b -> a *
128 checking for directory renames 123 checking for directory renames
129 resolving manifests 124 resolving manifests
130 overwrite: False, partial: False 125 overwrite: False, partial: False
131 ancestor: 68795b066622, local: d2e44c99fd3f+, remote: 5d205f8b35b6 126 ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
132 b: local copied/moved to a -> m 127 b: local copied/moved to a -> m
133 preserving b for resolve of b 128 preserving b for resolve of b
134 updating: b 1/1 files (100.00%) 129 updating: b 1/1 files (100.00%)
135 graft for revision 1 is empty 130 picked tool 'internal:merge' for b (binary False symlink False)
131 merging b and a to b
132 my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
133 premerge successful
134 b
136 grafting revision 5 135 grafting revision 5
137 searching for copies back to rev 1 136 searching for copies back to rev 1
138 resolving manifests 137 resolving manifests
139 overwrite: False, partial: False 138 overwrite: False, partial: False
140 ancestor: 4c60f11aa304, local: d2e44c99fd3f+, remote: 97f8bfe72746 139 ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
141 e: remote is newer -> g 140 e: remote is newer -> g
142 updating: e 1/1 files (100.00%) 141 updating: e 1/1 files (100.00%)
143 getting e 142 getting e
144 e 143 e
145 grafting revision 4 144 grafting revision 4
146 searching for copies back to rev 1 145 searching for copies back to rev 1
147 resolving manifests 146 resolving manifests
148 overwrite: False, partial: False 147 overwrite: False, partial: False
149 ancestor: 4c60f11aa304, local: 839a7e8fcf80+, remote: 9c233e8e184d 148 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
150 e: versions differ -> m 149 e: versions differ -> m
151 d: remote is newer -> g 150 d: remote is newer -> g
152 preserving e for resolve of e 151 preserving e for resolve of e
153 updating: d 1/2 files (50.00%) 152 updating: d 1/2 files (50.00%)
154 getting d 153 getting d
155 updating: e 2/2 files (100.00%) 154 updating: e 2/2 files (100.00%)
156 picked tool 'internal:merge' for e (binary False symlink False) 155 picked tool 'internal:merge' for e (binary False symlink False)
157 merging e 156 merging e
158 my e@839a7e8fcf80+ other e@9c233e8e184d ancestor e@68795b066622 157 my e@1905859650ec+ other e@9c233e8e184d ancestor e@68795b066622
159 warning: conflicts during merge. 158 warning: conflicts during merge.
160 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') 159 merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
161 abort: unresolved conflicts, can't continue 160 abort: unresolved conflicts, can't continue
162 (use hg resolve and hg graft --continue) 161 (use hg resolve and hg graft --continue)
163 [255] 162 [255]
199 R a 198 R a
200 199
201 View graph: 200 View graph:
202 201
203 $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n' 202 $ hg --config extensions.graphlog= log -G --template '{author}@{rev}.{phase}: {desc}\n'
204 @ test@10.draft: 3 203 @ test@11.draft: 3
205 | 204 |
206 o test@9.draft: 4 205 o test@10.draft: 4
207 | 206 |
208 o test@8.draft: 5 207 o test@9.draft: 5
208 |
209 o bar@8.draft: 1
209 | 210 |
210 o foo@7.draft: 2 211 o foo@7.draft: 2
211 | 212 |
212 | o test@6.secret: 6 213 | o test@6.secret: 6
213 | |\ 214 | |\
231 created new head 232 created new head
232 $ hg graft 7 233 $ hg graft 7
233 grafting revision 7 234 grafting revision 7
234 235
235 $ hg log -r 7 --template '{rev}:{node}\n' 236 $ hg log -r 7 --template '{rev}:{node}\n'
236 7:d2e44c99fd3f31c176ea4efb9eca9f6306c81756 237 7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
237 $ hg log -r 2 --template '{rev}:{node}\n' 238 $ hg log -r 2 --template '{rev}:{node}\n'
238 2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4 239 2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4
239 240
240 $ hg log --debug -r tip 241 $ hg log --debug -r tip
241 changeset: 12:95adbe5de6b10f376b699ece9ed5a57cd7b4b0f6 242 changeset: 13:9db0f28fd3747e92c57d015f53b5593aeec53c2d
242 tag: tip 243 tag: tip
243 phase: draft 244 phase: draft
244 parent: 11:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f 245 parent: 12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
245 parent: -1:0000000000000000000000000000000000000000 246 parent: -1:0000000000000000000000000000000000000000
246 manifest: 12:9944044f82a462bbaccc9bdf7e0ac5b811db7d1b 247 manifest: 13:dc313617b8c32457c0d589e0dbbedfe71f3cd637
247 user: foo 248 user: foo
248 date: Thu Jan 01 00:00:00 1970 +0000 249 date: Thu Jan 01 00:00:00 1970 +0000
249 files+: b 250 files+: b
250 files-: a 251 files-: a
251 extra: branch=default 252 extra: branch=default
259 $ hg graft 7 260 $ hg graft 7
260 skipping already grafted revision 7 (was grafted from 2) 261 skipping already grafted revision 7 (was grafted from 2)
261 [255] 262 [255]
262 263
263 Disallow grafting already grafted csets with the same origin onto each other 264 Disallow grafting already grafted csets with the same origin onto each other
264 $ hg up -q 12 265 $ hg up -q 13
265 $ hg graft 2 266 $ hg graft 2
266 skipping already grafted revision 2 267 skipping already grafted revision 2
267 [255] 268 [255]
268 $ hg graft 7 269 $ hg graft 7
269 skipping already grafted revision 7 (same origin 2) 270 skipping already grafted revision 7 (same origin 2)
272 $ hg up -q 7 273 $ hg up -q 7
273 $ hg graft 2 274 $ hg graft 2
274 skipping already grafted revision 2 275 skipping already grafted revision 2
275 [255] 276 [255]
276 $ hg graft tip 277 $ hg graft tip
277 skipping already grafted revision 12 (same origin 2) 278 skipping already grafted revision 13 (same origin 2)
278 [255] 279 [255]