89 $ hg exp |
89 $ hg exp |
90 # HG changeset patch |
90 # HG changeset patch |
91 # User test |
91 # User test |
92 # Date 0 0 |
92 # Date 0 0 |
93 # Thu Jan 01 00:00:00 1970 +0000 |
93 # Thu Jan 01 00:00:00 1970 +0000 |
94 # Node ID f8f130ec5d399699738abf984a885baa4fa9f06c |
94 # Node ID e7fdc662d6305fee2908c3f1630e0b20d6f4689a |
95 # Parent c7586e2a92645e473645847a7b69a6dc52be4276 |
95 # Parent c7586e2a92645e473645847a7b69a6dc52be4276 |
96 added b |
96 added b |
97 |
97 |
98 diff -r c7586e2a9264 -r f8f130ec5d39 b |
98 diff -r c7586e2a9264 -r e7fdc662d630 b |
99 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
99 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
100 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
100 +++ b/b Thu Jan 01 00:00:00 1970 +0000 |
101 @@ -0,0 +1,1 @@ |
101 @@ -0,0 +1,1 @@ |
102 +bar |
102 +bar |
103 |
103 |
104 $ hg debugobsolete |
104 $ hg debugobsolete |
105 b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
105 b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
106 b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
106 b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
107 da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
107 da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
108 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
108 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
109 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
109 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
110 $ hg obslog --all |
110 $ hg obslog --all |
111 @ f8f130ec5d39 (8) added b |
111 @ e7fdc662d630 (8) added b |
112 |\ |
112 |\ |
113 x | 11f849d7159f (7) added b |
113 x | 11f849d7159f (7) added b |
114 | | amended(content) as f8f130ec5d39 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
114 | | amended(content) as e7fdc662d630 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
115 | | |
115 | | |
116 | x 7ed0642d644b (5) added b |
116 | x 7ed0642d644b (5) added b |
117 | | rewritten as f8f130ec5d39 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
117 | | rewritten as e7fdc662d630 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
118 | | |
118 | | |
119 x | da4b96f4a8d6 (6) added b |
119 x | da4b96f4a8d6 (6) added b |
120 |/ rebased(parent) as 11f849d7159f using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
120 |/ rebased(parent) as 11f849d7159f using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
121 | |
121 | |
122 x b1661037fa25 (2) added b |
122 x b1661037fa25 (2) added b |
157 (branches are permanent and global, did you want a bookmark?) |
157 (branches are permanent and global, did you want a bookmark?) |
158 $ hg amend -m "added foo to x" |
158 $ hg amend -m "added foo to x" |
159 |
159 |
160 $ hg up 'predecessors(.)' --hidden |
160 $ hg up 'predecessors(.)' --hidden |
161 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
161 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
162 updated to hidden changeset 19fde4a13e16 |
162 updated to hidden changeset 801b5920c7ea |
163 (hidden revision '19fde4a13e16' was rewritten as: 271db13e4ad1) |
163 (hidden revision '801b5920c7ea' was rewritten as: 5cf74a13db18) |
164 working directory parent is obsolete! (19fde4a13e16) |
164 working directory parent is obsolete! (801b5920c7ea) |
165 (use 'hg evolve' to update to its successor: 271db13e4ad1) |
165 (use 'hg evolve' to update to its successor: 5cf74a13db18) |
166 $ hg rebase -r . -d 'desc("added d")' --config experimental.evolution.allowdivergence=True |
166 $ hg rebase -r . -d 'desc("added d")' --config experimental.evolution.allowdivergence=True |
167 rebasing 11:19fde4a13e16 "added x" |
167 rebasing 11:801b5920c7ea "added x" |
168 2 new content-divergent changesets |
168 2 new content-divergent changesets |
169 |
169 |
170 $ hg glog |
170 $ hg glog |
171 @ 13:eb9a1b31b6d8 added x |
171 @ 13:45e15d6e88f5 added x |
172 | () [default] draft |
172 | () [default] draft |
173 | * 12:271db13e4ad1 added foo to x |
173 | * 12:5cf74a13db18 added foo to x |
174 | | () [bar] draft |
174 | | () [bar] draft |
175 o | 10:d34e10c64365 added d |
175 o | 10:be5a8b9faa8a added d |
176 | | () [default] draft |
176 | | () [default] draft |
177 o | 9:65f70b47129d added c |
177 o | 9:e2ce33033e42 added c |
178 |/ () [default] draft |
178 |/ () [default] draft |
179 o 8:f8f130ec5d39 added b |
179 o 8:e7fdc662d630 added b |
180 | () [default] draft |
180 | () [default] draft |
181 o 1:c7586e2a9264 added a |
181 o 1:c7586e2a9264 added a |
182 | () [default] draft |
182 | () [default] draft |
183 o 0:8fa14d15e168 added hgignore |
183 o 0:8fa14d15e168 added hgignore |
184 () [default] draft |
184 () [default] draft |
185 |
185 |
186 $ hg evolve --content-divergent |
186 $ hg evolve --content-divergent |
187 merge:[13] added x |
187 merge:[13] added x |
188 with: [12] added foo to x |
188 with: [12] added foo to x |
189 base: [11] added x |
189 base: [11] added x |
190 rebasing "other" content-divergent changeset 271db13e4ad1 on d34e10c64365 |
190 rebasing "other" content-divergent changeset 5cf74a13db18 on be5a8b9faa8a |
191 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
191 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
192 working directory is now at 806f7694feb1 |
192 working directory is now at 4e844ab5e814 |
193 |
193 |
194 $ hg exp |
194 $ hg exp |
195 # HG changeset patch |
195 # HG changeset patch |
196 # User test |
196 # User test |
197 # Date 0 0 |
197 # Date 0 0 |
198 # Thu Jan 01 00:00:00 1970 +0000 |
198 # Thu Jan 01 00:00:00 1970 +0000 |
199 # Branch bar |
199 # Branch bar |
200 # Node ID 806f7694feb1c58fdd7bf656445f3bd5463a008e |
200 # Node ID 4e844ab5e8142d26fb1f0990486379f2410b0358 |
201 # Parent d34e10c643651d577eef840b427b58d9bd6ae3f0 |
201 # Parent be5a8b9faa8af54f115aa168a2c8564acb40c37d |
202 added foo to x |
202 added foo to x |
203 |
203 |
204 diff -r d34e10c64365 -r 806f7694feb1 x |
204 diff -r be5a8b9faa8a -r 4e844ab5e814 x |
205 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
205 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
206 +++ b/x Thu Jan 01 00:00:00 1970 +0000 |
206 +++ b/x Thu Jan 01 00:00:00 1970 +0000 |
207 @@ -0,0 +1,1 @@ |
207 @@ -0,0 +1,1 @@ |
208 +foo |
208 +foo |
209 |
209 |
210 The above `hg exp` and the following log call demonstrates that message, content |
210 The above `hg exp` and the following log call demonstrates that message, content |
211 and branch change is preserved in case of relocation |
211 and branch change is preserved in case of relocation |
212 $ hg glog |
212 $ hg glog |
213 @ 15:806f7694feb1 added foo to x |
213 @ 15:4e844ab5e814 added foo to x |
214 | () [bar] draft |
214 | () [bar] draft |
215 o 10:d34e10c64365 added d |
215 o 10:be5a8b9faa8a added d |
216 | () [default] draft |
216 | () [default] draft |
217 o 9:65f70b47129d added c |
217 o 9:e2ce33033e42 added c |
218 | () [default] draft |
218 | () [default] draft |
219 o 8:f8f130ec5d39 added b |
219 o 8:e7fdc662d630 added b |
220 | () [default] draft |
220 | () [default] draft |
221 o 1:c7586e2a9264 added a |
221 o 1:c7586e2a9264 added a |
222 | () [default] draft |
222 | () [default] draft |
223 o 0:8fa14d15e168 added hgignore |
223 o 0:8fa14d15e168 added hgignore |
224 () [default] draft |
224 () [default] draft |
225 |
225 |
226 $ hg debugobsolete |
226 $ hg debugobsolete |
227 b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
227 b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
228 b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
228 b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
229 da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
229 da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
230 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
230 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
231 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
231 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
232 ca1b80f7960aae2306287bab52b4090c59af8c29 65f70b47129d8466acbdc70bfb1efef3d05388e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
232 ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
233 c41c793e0ef1ddb463e85ea9491e377d01127ba2 d34e10c643651d577eef840b427b58d9bd6ae3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
233 c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
234 19fde4a13e167ceb55fcfd7937268027f7e716f0 271db13e4ad11d4ca78b12e74e7341cb74c05a85 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'} |
234 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'} |
235 19fde4a13e167ceb55fcfd7937268027f7e716f0 eb9a1b31b6d812c036ca547aca2931edde6d1e06 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
235 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
236 271db13e4ad11d4ca78b12e74e7341cb74c05a85 16810a5772dd9a27f4c0302d4e41009a2518588c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
236 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
237 eb9a1b31b6d812c036ca547aca2931edde6d1e06 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'} |
237 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'} |
238 16810a5772dd9a27f4c0302d4e41009a2518588c 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
238 911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
239 $ hg obslog --all |
239 $ hg obslog --all |
240 @ 806f7694feb1 (15) added foo to x |
240 @ 4e844ab5e814 (15) added foo to x |
241 |\ |
241 |\ |
242 x | 16810a5772dd (14) added foo to x |
242 x | 45e15d6e88f5 (13) added x |
243 | | rewritten as 806f7694feb1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
243 | | rewritten(description, branch, content) as 4e844ab5e814 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
244 | | |
244 | | |
245 | x eb9a1b31b6d8 (13) added x |
245 | x 911c21adca13 (14) added foo to x |
246 | | rewritten(description, branch, content) as 806f7694feb1 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
246 | | rewritten as 4e844ab5e814 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
247 | | |
247 | | |
248 x | 271db13e4ad1 (12) added foo to x |
248 | x 5cf74a13db18 (12) added foo to x |
249 |/ rebased(parent) as 16810a5772dd using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
249 |/ rebased(parent) as 911c21adca13 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
250 | |
250 | |
251 x 19fde4a13e16 (11) added x |
251 x 801b5920c7ea (11) added x |
252 rewritten(description, branch, content) as 271db13e4ad1 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
252 rebased(parent) as 45e15d6e88f5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
253 rebased(parent) as eb9a1b31b6d8 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
253 rewritten(description, branch, content) as 5cf74a13db18 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
254 |
254 |
255 |
255 |
256 Testing when both the content-divergence are on different parents and resolution |
256 Testing when both the content-divergence are on different parents and resolution |
257 will lead to conflicts |
257 will lead to conflicts |
258 --------------------------------------------------------------------------------- |
258 --------------------------------------------------------------------------------- |
261 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
261 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
262 |
262 |
263 $ echo y > y |
263 $ echo y > y |
264 $ hg ci -Aqm "added y" |
264 $ hg ci -Aqm "added y" |
265 $ hg glog -r . |
265 $ hg glog -r . |
266 @ 16:6a167ad77c24 added y |
266 @ 16:ecf1d3992eb4 added y |
267 | () [default] draft |
267 | () [default] draft |
268 ~ |
268 ~ |
269 |
269 |
270 $ echo bar > y |
270 $ echo bar > y |
271 $ hg amend |
271 $ hg amend |
272 |
272 |
273 $ hg up 'predecessors(.)' --hidden |
273 $ hg up 'predecessors(.)' --hidden |
274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
274 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
275 updated to hidden changeset 6a167ad77c24 |
275 updated to hidden changeset ecf1d3992eb4 |
276 (hidden revision '6a167ad77c24' was rewritten as: 856e7b6a8392) |
276 (hidden revision 'ecf1d3992eb4' was rewritten as: 9c32d35206fb) |
277 working directory parent is obsolete! (6a167ad77c24) |
277 working directory parent is obsolete! (ecf1d3992eb4) |
278 (use 'hg evolve' to update to its successor: 856e7b6a8392) |
278 (use 'hg evolve' to update to its successor: 9c32d35206fb) |
279 $ hg rebase -r . -d 'desc("added foo to x")' --config experimental.evolution.allowdivergence=True |
279 $ hg rebase -r . -d 'desc("added foo to x")' --config experimental.evolution.allowdivergence=True |
280 rebasing 16:6a167ad77c24 "added y" |
280 rebasing 16:ecf1d3992eb4 "added y" |
281 2 new content-divergent changesets |
281 2 new content-divergent changesets |
282 $ echo wat > y |
282 $ echo wat > y |
283 $ hg amend |
283 $ hg amend |
284 |
284 |
285 $ hg glog |
285 $ hg glog |
286 @ 19:750fd38fec35 added y |
286 @ 19:0faa43228ee7 added y |
287 | () [bar] draft |
287 | () [bar] draft |
288 | * 17:856e7b6a8392 added y |
288 | * 17:9c32d35206fb added y |
289 | | () [default] draft |
289 | | () [default] draft |
290 o | 15:806f7694feb1 added foo to x |
290 o | 15:4e844ab5e814 added foo to x |
291 | | () [bar] draft |
291 | | () [bar] draft |
292 o | 10:d34e10c64365 added d |
292 o | 10:be5a8b9faa8a added d |
293 | | () [default] draft |
293 | | () [default] draft |
294 o | 9:65f70b47129d added c |
294 o | 9:e2ce33033e42 added c |
295 |/ () [default] draft |
295 |/ () [default] draft |
296 o 8:f8f130ec5d39 added b |
296 o 8:e7fdc662d630 added b |
297 | () [default] draft |
297 | () [default] draft |
298 o 1:c7586e2a9264 added a |
298 o 1:c7586e2a9264 added a |
299 | () [default] draft |
299 | () [default] draft |
300 o 0:8fa14d15e168 added hgignore |
300 o 0:8fa14d15e168 added hgignore |
301 () [default] draft |
301 () [default] draft |
302 |
302 |
303 $ hg evolve --content-divergent |
303 $ hg evolve --content-divergent |
304 merge:[19] added y |
304 merge:[19] added y |
305 with: [17] added y |
305 with: [17] added y |
306 base: [16] added y |
306 base: [16] added y |
307 rebasing "other" content-divergent changeset 856e7b6a8392 on 806f7694feb1 |
307 rebasing "other" content-divergent changeset 9c32d35206fb on 4e844ab5e814 |
308 merging y |
308 merging y |
309 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
309 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
310 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
310 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
311 unresolved merge conflicts |
311 unresolved merge conflicts |
312 (see 'hg help evolve.interrupted') |
312 (see 'hg help evolve.interrupted') |
315 $ echo watbar > y |
315 $ echo watbar > y |
316 $ hg resolve -m |
316 $ hg resolve -m |
317 (no more unresolved files) |
317 (no more unresolved files) |
318 continue: hg evolve --continue |
318 continue: hg evolve --continue |
319 $ hg evolve --continue |
319 $ hg evolve --continue |
320 working directory is now at 68ce3ad10d10 |
320 working directory is now at ba11a9f47a2e |
321 |
321 |
322 $ hg glog |
322 $ hg glog |
323 @ 21:68ce3ad10d10 added y |
323 @ 21:ba11a9f47a2e added y |
324 | () [bar] draft |
324 | () [bar] draft |
325 o 15:806f7694feb1 added foo to x |
325 o 15:4e844ab5e814 added foo to x |
326 | () [bar] draft |
326 | () [bar] draft |
327 o 10:d34e10c64365 added d |
327 o 10:be5a8b9faa8a added d |
328 | () [default] draft |
328 | () [default] draft |
329 o 9:65f70b47129d added c |
329 o 9:e2ce33033e42 added c |
330 | () [default] draft |
330 | () [default] draft |
331 o 8:f8f130ec5d39 added b |
331 o 8:e7fdc662d630 added b |
332 | () [default] draft |
332 | () [default] draft |
333 o 1:c7586e2a9264 added a |
333 o 1:c7586e2a9264 added a |
334 | () [default] draft |
334 | () [default] draft |
335 o 0:8fa14d15e168 added hgignore |
335 o 0:8fa14d15e168 added hgignore |
336 () [default] draft |
336 () [default] draft |
337 |
337 |
338 $ hg debugobsolete |
338 $ hg debugobsolete |
339 b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
339 b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
340 b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
340 b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
341 da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
341 da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
342 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
342 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
343 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
343 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
344 ca1b80f7960aae2306287bab52b4090c59af8c29 65f70b47129d8466acbdc70bfb1efef3d05388e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
344 ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
345 c41c793e0ef1ddb463e85ea9491e377d01127ba2 d34e10c643651d577eef840b427b58d9bd6ae3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
345 c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
346 19fde4a13e167ceb55fcfd7937268027f7e716f0 271db13e4ad11d4ca78b12e74e7341cb74c05a85 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'} |
346 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'} |
347 19fde4a13e167ceb55fcfd7937268027f7e716f0 eb9a1b31b6d812c036ca547aca2931edde6d1e06 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
347 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
348 271db13e4ad11d4ca78b12e74e7341cb74c05a85 16810a5772dd9a27f4c0302d4e41009a2518588c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
348 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
349 eb9a1b31b6d812c036ca547aca2931edde6d1e06 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'} |
349 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'} |
350 16810a5772dd9a27f4c0302d4e41009a2518588c 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
350 911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
351 6a167ad77c24406c8093b735220c7fe75ed313a6 856e7b6a8392638923637851f93d2e6b4196c37f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
351 ecf1d3992eb4d9700d441013fc4e89014692b461 9c32d35206fb5c3bf0ac814d410914d54a959a87 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
352 6a167ad77c24406c8093b735220c7fe75ed313a6 9916514079c2e21fac219b2e31735a065e83ced8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'} |
352 ecf1d3992eb4d9700d441013fc4e89014692b461 1bb9315961377c18863281be7634ec8ff9b73ea9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'} |
353 9916514079c2e21fac219b2e31735a065e83ced8 750fd38fec355bf4dc56c36443c9b6d59670946c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
353 1bb9315961377c18863281be7634ec8ff9b73ea9 0faa43228ee7fb9c993f076cef7e2ac14c85954b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
354 856e7b6a8392638923637851f93d2e6b4196c37f 1376c32668b4d8f3073bf8dde759afaf4ac512e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
354 9c32d35206fb5c3bf0ac814d410914d54a959a87 0fc12918c8daa12ca83ce1e2a38e252b063b6276 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
355 750fd38fec355bf4dc56c36443c9b6d59670946c 68ce3ad10d102c3d5dafb324a1b90a0a356dbb8e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
355 0faa43228ee7fb9c993f076cef7e2ac14c85954b ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
356 1376c32668b4d8f3073bf8dde759afaf4ac512e2 68ce3ad10d102c3d5dafb324a1b90a0a356dbb8e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'} |
356 0fc12918c8daa12ca83ce1e2a38e252b063b6276 ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'} |
357 $ hg obslog -r . --all |
357 $ hg obslog -r . --all |
358 @ 68ce3ad10d10 (21) added y |
358 @ ba11a9f47a2e (21) added y |
359 |\ |
359 |\ |
360 x | 1376c32668b4 (20) added y |
360 x | 0faa43228ee7 (19) added y |
361 | | rewritten(branch, content) as 68ce3ad10d10 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
361 | | amended(content) as ba11a9f47a2e using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
362 | | |
362 | | |
363 | x 750fd38fec35 (19) added y |
363 | x 0fc12918c8da (20) added y |
364 | | amended(content) as 68ce3ad10d10 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
364 | | rewritten(branch, content) as ba11a9f47a2e using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
365 | | |
365 | | |
366 x | 856e7b6a8392 (17) added y |
366 x | 1bb931596137 (18) added y |
367 | | rebased(parent) as 1376c32668b4 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
367 | | amended(content) as 0faa43228ee7 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
368 | | |
368 | | |
369 | x 9916514079c2 (18) added y |
369 | x 9c32d35206fb (17) added y |
370 |/ amended(content) as 750fd38fec35 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
370 |/ rebased(parent) as 0fc12918c8da using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
371 | |
371 | |
372 x 6a167ad77c24 (16) added y |
372 x ecf1d3992eb4 (16) added y |
373 amended(content) as 856e7b6a8392 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
373 rewritten(branch, parent) as 1bb931596137 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
374 rewritten(branch, parent) as 9916514079c2 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
374 amended(content) as 9c32d35206fb using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
375 |
375 |
376 |
376 |
377 checking that relocated commit is there |
377 checking that relocated commit is there |
378 $ hg exp 20 --hidden |
378 $ hg exp 20 --hidden |
379 # HG changeset patch |
379 # HG changeset patch |
380 # User test |
380 # User test |
381 # Date 0 0 |
381 # Date 0 0 |
382 # Thu Jan 01 00:00:00 1970 +0000 |
382 # Thu Jan 01 00:00:00 1970 +0000 |
383 # Node ID 1376c32668b4d8f3073bf8dde759afaf4ac512e2 |
383 # Node ID 0fc12918c8daa12ca83ce1e2a38e252b063b6276 |
384 # Parent 806f7694feb1c58fdd7bf656445f3bd5463a008e |
384 # Parent 4e844ab5e8142d26fb1f0990486379f2410b0358 |
385 added y |
385 added y |
386 |
386 |
387 diff -r 806f7694feb1 -r 1376c32668b4 y |
387 diff -r 4e844ab5e814 -r 0fc12918c8da y |
388 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
388 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
389 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
389 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
390 @@ -0,0 +1,1 @@ |
390 @@ -0,0 +1,1 @@ |
391 +bar |
391 +bar |
392 |
392 |
393 Testing when the relocation will result in conflicts and merging also: |
393 Testing when the relocation will result in conflicts and merging also: |
394 ---------------------------------------------------------------------- |
394 ---------------------------------------------------------------------- |
395 |
395 |
396 $ hg glog |
396 $ hg glog |
397 @ 21:68ce3ad10d10 added y |
397 @ 21:ba11a9f47a2e added y |
398 | () [bar] draft |
398 | () [bar] draft |
399 o 15:806f7694feb1 added foo to x |
399 o 15:4e844ab5e814 added foo to x |
400 | () [bar] draft |
400 | () [bar] draft |
401 o 10:d34e10c64365 added d |
401 o 10:be5a8b9faa8a added d |
402 | () [default] draft |
402 | () [default] draft |
403 o 9:65f70b47129d added c |
403 o 9:e2ce33033e42 added c |
404 | () [default] draft |
404 | () [default] draft |
405 o 8:f8f130ec5d39 added b |
405 o 8:e7fdc662d630 added b |
406 | () [default] draft |
406 | () [default] draft |
407 o 1:c7586e2a9264 added a |
407 o 1:c7586e2a9264 added a |
408 | () [default] draft |
408 | () [default] draft |
409 o 0:8fa14d15e168 added hgignore |
409 o 0:8fa14d15e168 added hgignore |
410 () [default] draft |
410 () [default] draft |
413 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
413 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
414 |
414 |
415 $ echo z > z |
415 $ echo z > z |
416 $ hg ci -Aqm "added z" |
416 $ hg ci -Aqm "added z" |
417 $ hg glog -r . |
417 $ hg glog -r . |
418 @ 22:2d5d2b8719d6 added z |
418 @ 22:2048a66e8834 added z |
419 | () [default] draft |
419 | () [default] draft |
420 ~ |
420 ~ |
421 |
421 |
422 $ echo foo > y |
422 $ echo foo > y |
423 $ hg add y |
423 $ hg add y |
424 $ hg amend |
424 $ hg amend |
425 |
425 |
426 $ hg up 'predecessors(.)' --hidden |
426 $ hg up 'predecessors(.)' --hidden |
427 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
427 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
428 updated to hidden changeset 2d5d2b8719d6 |
428 updated to hidden changeset 2048a66e8834 |
429 (hidden revision '2d5d2b8719d6' was rewritten as: ff9e3b1b6df8) |
429 (hidden revision '2048a66e8834' was rewritten as: 9bc2ace42175) |
430 working directory parent is obsolete! (2d5d2b8719d6) |
430 working directory parent is obsolete! (2048a66e8834) |
431 (use 'hg evolve' to update to its successor: ff9e3b1b6df8) |
431 (use 'hg evolve' to update to its successor: 9bc2ace42175) |
432 $ hg rebase -r . -d 'desc("added y")' --config experimental.evolution.allowdivergence=True |
432 $ hg rebase -r . -d 'desc("added y")' --config experimental.evolution.allowdivergence=True |
433 rebasing 22:2d5d2b8719d6 "added z" |
433 rebasing 22:2048a66e8834 "added z" |
434 2 new content-divergent changesets |
434 2 new content-divergent changesets |
435 $ echo bar > z |
435 $ echo bar > z |
436 $ hg amend |
436 $ hg amend |
437 |
437 |
438 $ hg glog |
438 $ hg glog |
439 @ 25:f8b6462d0f09 added z |
439 @ 25:ad2ec16eca1e added z |
440 | () [bar] draft |
440 | () [bar] draft |
441 | * 23:ff9e3b1b6df8 added z |
441 | * 23:9bc2ace42175 added z |
442 | | () [default] draft |
442 | | () [default] draft |
443 o | 21:68ce3ad10d10 added y |
443 o | 21:ba11a9f47a2e added y |
444 | | () [bar] draft |
444 | | () [bar] draft |
445 o | 15:806f7694feb1 added foo to x |
445 o | 15:4e844ab5e814 added foo to x |
446 | | () [bar] draft |
446 | | () [bar] draft |
447 o | 10:d34e10c64365 added d |
447 o | 10:be5a8b9faa8a added d |
448 | | () [default] draft |
448 | | () [default] draft |
449 o | 9:65f70b47129d added c |
449 o | 9:e2ce33033e42 added c |
450 |/ () [default] draft |
450 |/ () [default] draft |
451 o 8:f8f130ec5d39 added b |
451 o 8:e7fdc662d630 added b |
452 | () [default] draft |
452 | () [default] draft |
453 o 1:c7586e2a9264 added a |
453 o 1:c7586e2a9264 added a |
454 | () [default] draft |
454 | () [default] draft |
455 o 0:8fa14d15e168 added hgignore |
455 o 0:8fa14d15e168 added hgignore |
456 () [default] draft |
456 () [default] draft |
457 |
457 |
458 $ hg evolve --content-divergent --any |
458 $ hg evolve --content-divergent --any |
459 merge:[25] added z |
459 merge:[25] added z |
460 with: [23] added z |
460 with: [23] added z |
461 base: [22] added z |
461 base: [22] added z |
462 rebasing "other" content-divergent changeset ff9e3b1b6df8 on 68ce3ad10d10 |
462 rebasing "other" content-divergent changeset 9bc2ace42175 on ba11a9f47a2e |
463 merging y |
463 merging y |
464 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
464 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
465 unresolved merge conflicts |
465 unresolved merge conflicts |
466 (see 'hg help evolve.interrupted') |
466 (see 'hg help evolve.interrupted') |
467 [1] |
467 [1] |
468 |
468 |
469 $ hg diff |
469 $ hg diff |
470 diff -r 68ce3ad10d10 y |
470 diff -r ba11a9f47a2e y |
471 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
471 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
472 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
472 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
473 @@ -1,1 +1,5 @@ |
473 @@ -1,1 +1,5 @@ |
474 +<<<<<<< destination: 68ce3ad10d10 bar - test: added y |
474 +<<<<<<< destination: ba11a9f47a2e bar - test: added y |
475 watbar |
475 watbar |
476 +======= |
476 +======= |
477 +foo |
477 +foo |
478 +>>>>>>> evolving: ff9e3b1b6df8 - test: added z |
478 +>>>>>>> evolving: 9bc2ace42175 - test: added z |
479 diff -r 68ce3ad10d10 z |
479 diff -r ba11a9f47a2e z |
480 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
480 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
481 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
481 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
482 @@ -0,0 +1,1 @@ |
482 @@ -0,0 +1,1 @@ |
483 +z |
483 +z |
484 |
484 |
486 $ hg resolve -m |
486 $ hg resolve -m |
487 (no more unresolved files) |
487 (no more unresolved files) |
488 continue: hg evolve --continue |
488 continue: hg evolve --continue |
489 |
489 |
490 $ hg evolve --continue |
490 $ hg evolve --continue |
491 evolving 23:ff9e3b1b6df8 "added z" |
491 evolving 23:9bc2ace42175 "added z" |
492 merging y |
492 merging y |
493 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
493 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
494 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
494 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
495 unresolved merge conflicts |
495 unresolved merge conflicts |
496 (see 'hg help evolve.interrupted') |
496 (see 'hg help evolve.interrupted') |
497 [1] |
497 [1] |
498 |
498 |
499 $ hg diff |
499 $ hg diff |
500 diff -r f8b6462d0f09 y |
500 diff -r ad2ec16eca1e y |
501 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
501 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
502 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
502 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
503 @@ -1,1 +1,5 @@ |
503 @@ -1,1 +1,5 @@ |
504 +<<<<<<< local: f8b6462d0f09 bar - test: added z |
504 +<<<<<<< local: ad2ec16eca1e bar - test: added z |
505 watbar |
505 watbar |
506 +======= |
506 +======= |
507 +foo |
507 +foo |
508 +>>>>>>> other: 53bfc763e92e - test: added z |
508 +>>>>>>> other: a7326a078527 - test: added z |
509 |
509 |
510 $ echo foo > y |
510 $ echo foo > y |
511 $ hg resolve -m |
511 $ hg resolve -m |
512 (no more unresolved files) |
512 (no more unresolved files) |
513 continue: hg evolve --continue |
513 continue: hg evolve --continue |
514 $ hg evolve --continue |
514 $ hg evolve --continue |
515 working directory is now at d17538c7d8eb |
515 working directory is now at 45e55c9ab3d0 |
516 |
516 |
517 $ hg glog |
517 $ hg glog |
518 @ 27:d17538c7d8eb added z |
518 @ 27:45e55c9ab3d0 added z |
519 | () [bar] draft |
519 | () [bar] draft |
520 o 21:68ce3ad10d10 added y |
520 o 21:ba11a9f47a2e added y |
521 | () [bar] draft |
521 | () [bar] draft |
522 o 15:806f7694feb1 added foo to x |
522 o 15:4e844ab5e814 added foo to x |
523 | () [bar] draft |
523 | () [bar] draft |
524 o 10:d34e10c64365 added d |
524 o 10:be5a8b9faa8a added d |
525 | () [default] draft |
525 | () [default] draft |
526 o 9:65f70b47129d added c |
526 o 9:e2ce33033e42 added c |
527 | () [default] draft |
527 | () [default] draft |
528 o 8:f8f130ec5d39 added b |
528 o 8:e7fdc662d630 added b |
529 | () [default] draft |
529 | () [default] draft |
530 o 1:c7586e2a9264 added a |
530 o 1:c7586e2a9264 added a |
531 | () [default] draft |
531 | () [default] draft |
532 o 0:8fa14d15e168 added hgignore |
532 o 0:8fa14d15e168 added hgignore |
533 () [default] draft |
533 () [default] draft |
536 # HG changeset patch |
536 # HG changeset patch |
537 # User test |
537 # User test |
538 # Date 0 0 |
538 # Date 0 0 |
539 # Thu Jan 01 00:00:00 1970 +0000 |
539 # Thu Jan 01 00:00:00 1970 +0000 |
540 # Branch bar |
540 # Branch bar |
541 # Node ID d17538c7d8eb057a9ed807d29ff951e9f7940e83 |
541 # Node ID 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb |
542 # Parent 68ce3ad10d102c3d5dafb324a1b90a0a356dbb8e |
542 # Parent ba11a9f47a2e4a3380c4d5f80f64de41645a6681 |
543 added z |
543 added z |
544 |
544 |
545 diff -r 68ce3ad10d10 -r d17538c7d8eb y |
545 diff -r ba11a9f47a2e -r 45e55c9ab3d0 y |
546 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
546 --- a/y Thu Jan 01 00:00:00 1970 +0000 |
547 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
547 +++ b/y Thu Jan 01 00:00:00 1970 +0000 |
548 @@ -1,1 +1,1 @@ |
548 @@ -1,1 +1,1 @@ |
549 -watbar |
549 -watbar |
550 +foo |
550 +foo |
551 diff -r 68ce3ad10d10 -r d17538c7d8eb z |
551 diff -r ba11a9f47a2e -r 45e55c9ab3d0 z |
552 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
552 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
553 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
553 +++ b/z Thu Jan 01 00:00:00 1970 +0000 |
554 @@ -0,0 +1,1 @@ |
554 @@ -0,0 +1,1 @@ |
555 +bar |
555 +bar |
556 |
556 |
557 $ hg debugobsolete |
557 $ hg debugobsolete |
558 b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
558 b1661037fa25511d0b7ccddf405e336f9d7d3424 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
559 b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
559 b1661037fa25511d0b7ccddf405e336f9d7d3424 da4b96f4a8d610a85b225583138f681d67e275dd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
560 da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
560 da4b96f4a8d610a85b225583138f681d67e275dd 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
561 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
561 7ed0642d644bb9ad93d252dd9ffe7b4729febe48 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
562 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 f8f130ec5d399699738abf984a885baa4fa9f06c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
562 11f849d7159fa30a63dbbc1a6d251a8d996baeb5 e7fdc662d6305fee2908c3f1630e0b20d6f4689a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
563 ca1b80f7960aae2306287bab52b4090c59af8c29 65f70b47129d8466acbdc70bfb1efef3d05388e7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
563 ca1b80f7960aae2306287bab52b4090c59af8c29 e2ce33033e42db2e61a5f71c6dfb52a33efeaf6a 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
564 c41c793e0ef1ddb463e85ea9491e377d01127ba2 d34e10c643651d577eef840b427b58d9bd6ae3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
564 c41c793e0ef1ddb463e85ea9491e377d01127ba2 be5a8b9faa8af54f115aa168a2c8564acb40c37d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
565 19fde4a13e167ceb55fcfd7937268027f7e716f0 271db13e4ad11d4ca78b12e74e7341cb74c05a85 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'} |
565 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'amend', 'user': 'test'} |
566 19fde4a13e167ceb55fcfd7937268027f7e716f0 eb9a1b31b6d812c036ca547aca2931edde6d1e06 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
566 801b5920c7ea8d4ebdbc9cfc1e79e665dea2f211 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
567 271db13e4ad11d4ca78b12e74e7341cb74c05a85 16810a5772dd9a27f4c0302d4e41009a2518588c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
567 5cf74a13db180e33dc2df8cd2aa70b21252a2a64 911c21adca136894a2b35f0a58fae7ee94fa5e61 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
568 eb9a1b31b6d812c036ca547aca2931edde6d1e06 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'} |
568 45e15d6e88f5bd23ba360dff0c7591eca2d99f43 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '73', 'operation': 'evolve', 'user': 'test'} |
569 16810a5772dd9a27f4c0302d4e41009a2518588c 806f7694feb1c58fdd7bf656445f3bd5463a008e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
569 911c21adca136894a2b35f0a58fae7ee94fa5e61 4e844ab5e8142d26fb1f0990486379f2410b0358 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
570 6a167ad77c24406c8093b735220c7fe75ed313a6 856e7b6a8392638923637851f93d2e6b4196c37f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
570 ecf1d3992eb4d9700d441013fc4e89014692b461 9c32d35206fb5c3bf0ac814d410914d54a959a87 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
571 6a167ad77c24406c8093b735220c7fe75ed313a6 9916514079c2e21fac219b2e31735a065e83ced8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'} |
571 ecf1d3992eb4d9700d441013fc4e89014692b461 1bb9315961377c18863281be7634ec8ff9b73ea9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'} |
572 9916514079c2e21fac219b2e31735a065e83ced8 750fd38fec355bf4dc56c36443c9b6d59670946c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
572 1bb9315961377c18863281be7634ec8ff9b73ea9 0faa43228ee7fb9c993f076cef7e2ac14c85954b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
573 856e7b6a8392638923637851f93d2e6b4196c37f 1376c32668b4d8f3073bf8dde759afaf4ac512e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
573 9c32d35206fb5c3bf0ac814d410914d54a959a87 0fc12918c8daa12ca83ce1e2a38e252b063b6276 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
574 750fd38fec355bf4dc56c36443c9b6d59670946c 68ce3ad10d102c3d5dafb324a1b90a0a356dbb8e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
574 0faa43228ee7fb9c993f076cef7e2ac14c85954b ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
575 1376c32668b4d8f3073bf8dde759afaf4ac512e2 68ce3ad10d102c3d5dafb324a1b90a0a356dbb8e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'} |
575 0fc12918c8daa12ca83ce1e2a38e252b063b6276 ba11a9f47a2e4a3380c4d5f80f64de41645a6681 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'} |
576 2d5d2b8719d63d07b1c4bf5b5ea30b924b00a83e ff9e3b1b6df81fe45e8aad1fa86145588da0d20f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
576 2048a66e8834bda866dcc8c479f091897816833e 9bc2ace42175da7380251fca97730f62ff5b9185 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
577 2d5d2b8719d63d07b1c4bf5b5ea30b924b00a83e 30de78f605eb1cf2f31edfe9c34789118e7f47a0 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'} |
577 2048a66e8834bda866dcc8c479f091897816833e ee19d6cc67048a1a7469268068a1413611720975 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '68', 'operation': 'rebase', 'user': 'test'} |
578 30de78f605eb1cf2f31edfe9c34789118e7f47a0 f8b6462d0f09ea491c801a49094cb452d4197333 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
578 ee19d6cc67048a1a7469268068a1413611720975 ad2ec16eca1eac4cf5045b496efa6205652e9a02 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
579 ff9e3b1b6df81fe45e8aad1fa86145588da0d20f 53bfc763e92e5ce04f978fde72667eab1d7e01fb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'} |
579 9bc2ace42175da7380251fca97730f62ff5b9185 a7326a0785271a7bef2e812a9a742fb4256b4a3c 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'} |
580 f8b6462d0f09ea491c801a49094cb452d4197333 d17538c7d8eb057a9ed807d29ff951e9f7940e83 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
580 ad2ec16eca1eac4cf5045b496efa6205652e9a02 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
581 53bfc763e92e5ce04f978fde72667eab1d7e01fb d17538c7d8eb057a9ed807d29ff951e9f7940e83 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'} |
581 a7326a0785271a7bef2e812a9a742fb4256b4a3c 45e55c9ab3d0b4746161fcbe5b6c062eb4647fdb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '72', 'operation': 'evolve', 'user': 'test'} |
582 $ hg obslog --all |
582 $ hg obslog --all |
583 @ d17538c7d8eb (27) added z |
583 @ 45e55c9ab3d0 (27) added z |
584 |\ |
584 |\ |
585 x | 53bfc763e92e (26) added z |
585 x | a7326a078527 (26) added z |
586 | | rewritten(branch, content) as d17538c7d8eb using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
586 | | rewritten(branch, content) as 45e55c9ab3d0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
587 | | |
587 | | |
588 | x f8b6462d0f09 (25) added z |
588 | x ad2ec16eca1e (25) added z |
589 | | amended(content) as d17538c7d8eb using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
589 | | amended(content) as 45e55c9ab3d0 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
590 | | |
590 | | |
591 | x 30de78f605eb (24) added z |
591 x | 9bc2ace42175 (23) added z |
592 | | amended(content) as f8b6462d0f09 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
592 | | rewritten(parent, content) as a7326a078527 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
593 | | |
593 | | |
594 x | ff9e3b1b6df8 (23) added z |
594 | x ee19d6cc6704 (24) added z |
595 |/ rewritten(parent, content) as 53bfc763e92e using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
595 |/ amended(content) as ad2ec16eca1e using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
596 | |
596 | |
597 x 2d5d2b8719d6 (22) added z |
597 x 2048a66e8834 (22) added z |
598 rewritten(branch, parent) as 30de78f605eb using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
598 amended(content) as 9bc2ace42175 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
599 amended(content) as ff9e3b1b6df8 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
599 rewritten(branch, parent) as ee19d6cc6704 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
600 |
600 |
601 |
601 |
602 $ cd .. |
602 $ cd .. |
603 |
603 |
604 Testing when relocation results in nothing to commit |
604 Testing when relocation results in nothing to commit |
673 |
673 |
674 $ hg evolve --any |
674 $ hg evolve --any |
675 move:[5] child |
675 move:[5] child |
676 atop:[7] divergent |
676 atop:[7] divergent |
677 $ hg glog |
677 $ hg glog |
678 o 8:6da8b7911364 child |
678 o 8:916b4ec3b91f child |
679 | () [default] draft |
679 | () [default] draft |
680 o 7:dfabf49594ff divergent |
680 o 7:cc3d0c6117c7 divergent |
681 | () [default] draft |
681 | () [default] draft |
682 o 1:33c576d20069 upstream |
682 o 1:33c576d20069 upstream |
683 | () [default] draft |
683 | () [default] draft |
684 o 0:98a3f8f02ba7 initial |
684 o 0:98a3f8f02ba7 initial |
685 () [default] draft |
685 () [default] draft |
686 $ hg debugobsolete |
686 $ hg debugobsolete |
687 898ddd4443b3d5520bf48f22f9411d5a0751cf2e befae61385695f1ae4b78b030ad91075b2b523ef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
687 898ddd4443b3d5520bf48f22f9411d5a0751cf2e befae61385695f1ae4b78b030ad91075b2b523ef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
688 898ddd4443b3d5520bf48f22f9411d5a0751cf2e 4cc21313ecee97ce33265514a0596a192bfa6b3f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
688 898ddd4443b3d5520bf48f22f9411d5a0751cf2e 4cc21313ecee97ce33265514a0596a192bfa6b3f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
689 4cc21313ecee97ce33265514a0596a192bfa6b3f bf4fe3a3afeb14c338094f41a35863921856592f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'} |
689 4cc21313ecee97ce33265514a0596a192bfa6b3f bf4fe3a3afeb14c338094f41a35863921856592f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'} |
690 befae61385695f1ae4b78b030ad91075b2b523ef dfabf49594ff9aa09d71ca6cc8e574e84bf0e651 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
690 befae61385695f1ae4b78b030ad91075b2b523ef cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'evolve', 'user': 'test'} |
691 bf4fe3a3afeb14c338094f41a35863921856592f dfabf49594ff9aa09d71ca6cc8e574e84bf0e651 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
691 bf4fe3a3afeb14c338094f41a35863921856592f cc3d0c6117c7400995107497370fa4c2138399cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
692 88473f9137d12e90055d30bbb9b78dd786520870 6da8b7911364bc7f4cde60ba07e57213c6dfb14e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
692 88473f9137d12e90055d30bbb9b78dd786520870 916b4ec3b91fd03826bd4b179051ae3cee633b56 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
693 $ hg obslog -r 'desc("divergent")' --all |
693 $ hg obslog -r 'desc("divergent")' --all |
694 o dfabf49594ff (7) divergent |
694 o cc3d0c6117c7 (7) divergent |
695 |\ |
695 |\ |
696 x | befae6138569 (3) divergent |
696 x | befae6138569 (3) divergent |
697 | | amended(content) as dfabf49594ff using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
697 | | amended(content) as cc3d0c6117c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
698 | | |
698 | | |
699 | x bf4fe3a3afeb (6) divergent |
699 | x bf4fe3a3afeb (6) divergent |
700 | | rewritten as dfabf49594ff using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
700 | | rewritten as cc3d0c6117c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
701 | | |
701 | | |
702 | x 4cc21313ecee (4) divergent |
702 | x 4cc21313ecee (4) divergent |
703 |/ rewritten(parent, content) as bf4fe3a3afeb using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
703 |/ rewritten(parent, content) as bf4fe3a3afeb using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
704 | |
704 | |
705 x 898ddd4443b3 (2) divergent |
705 x 898ddd4443b3 (2) divergent |