307 .hgsubstate: versions differ -> m (premerge) |
307 .hgsubstate: versions differ -> m (premerge) |
308 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
308 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
309 subrepo t: both sides changed |
309 subrepo t: both sides changed |
310 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) |
310 subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198) |
311 starting 4 threads for background file closing (?) |
311 starting 4 threads for background file closing (?) |
312 (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m |
312 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]. |
|
313 what do you want to do? m |
313 merging subrepository "t" |
314 merging subrepository "t" |
314 resolving manifests |
315 resolving manifests |
315 branchmerge: True, force: False, partial: False |
316 branchmerge: True, force: False, partial: False |
316 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
317 ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
|
318 starting 4 threads for background file closing (?) |
317 preserving t for resolve of t |
319 preserving t for resolve of t |
318 starting 4 threads for background file closing (?) |
|
319 t: versions differ -> m (premerge) |
320 t: versions differ -> m (premerge) |
320 picked tool ':merge' for t (binary False symlink False changedelete False) |
321 picked tool ':merge' for t (binary False symlink False changedelete False) |
321 merging t |
322 merging t |
322 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
323 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
323 t: versions differ -> m (merge) |
324 t: versions differ -> m (merge) |
906 |
907 |
907 $ hg up 5 |
908 $ hg up 5 |
908 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
909 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
909 $ hg merge 4 # try to merge default into br again |
910 $ hg merge 4 # try to merge default into br again |
910 subrepository s diverged (local revision: f8f13b33206e, remote revision: a3f9062a4f88) |
911 subrepository s diverged (local revision: f8f13b33206e, remote revision: a3f9062a4f88) |
911 (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m |
912 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]. |
|
913 what do you want to do? m |
912 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
914 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
913 (branch merge, don't forget to commit) |
915 (branch merge, don't forget to commit) |
914 $ cd .. |
916 $ cd .. |
915 |
917 |
916 test subrepo delete from .hgsubstate |
918 test subrepo delete from .hgsubstate |
1197 adding manifests |
1199 adding manifests |
1198 adding file changes |
1200 adding file changes |
1199 added 1 changesets with 2 changes to 2 files |
1201 added 1 changesets with 2 changes to 2 files |
1200 new changesets c82b79fdcc5b |
1202 new changesets c82b79fdcc5b |
1201 subrepository sub/repo diverged (local revision: f42d5c7504a8, remote revision: 46cd4aac504c) |
1203 subrepository sub/repo diverged (local revision: f42d5c7504a8, remote revision: 46cd4aac504c) |
1202 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
1204 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
|
1205 what do you want to do? m |
1203 pulling subrepo sub/repo from $TESTTMP/issue1852a/sub/repo |
1206 pulling subrepo sub/repo from $TESTTMP/issue1852a/sub/repo |
1204 searching for changes |
1207 searching for changes |
1205 adding changesets |
1208 adding changesets |
1206 adding manifests |
1209 adding manifests |
1207 adding file changes |
1210 adding file changes |
1208 added 1 changesets with 1 changes to 1 files |
1211 added 1 changesets with 1 changes to 1 files |
1209 new changesets 46cd4aac504c |
1212 new changesets 46cd4aac504c |
1210 subrepository sources for sub/repo differ |
1213 subrepository sources for sub/repo differ |
1211 use (l)ocal source (f42d5c7504a8) or (r)emote source (46cd4aac504c)? l |
1214 you can use (l)ocal source (f42d5c7504a8) or (r)emote source (46cd4aac504c). |
|
1215 what do you want to do? l |
1212 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1216 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1213 $ cat issue1852d/.hgsubstate |
1217 $ cat issue1852d/.hgsubstate |
1214 f42d5c7504a811dda50f5cf3e5e16c3330b87172 sub/repo |
1218 f42d5c7504a811dda50f5cf3e5e16c3330b87172 sub/repo |
1215 |
1219 |
1216 Check status of files when none of them belong to the first |
1220 Check status of files when none of them belong to the first |
1333 fc627a69481f+ |
1337 fc627a69481f+ |
1334 $ hg -R t id |
1338 $ hg -R t id |
1335 e95bcfa18a35+ |
1339 e95bcfa18a35+ |
1336 $ hg update tip |
1340 $ hg update tip |
1337 subrepository s diverged (local revision: fc627a69481f, remote revision: 12a213df6fa9) |
1341 subrepository s diverged (local revision: fc627a69481f, remote revision: 12a213df6fa9) |
1338 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
1342 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
|
1343 what do you want to do? m |
1339 subrepository sources for s differ |
1344 subrepository sources for s differ |
1340 use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9)? l |
1345 you can use (l)ocal source (fc627a69481f) or (r)emote source (12a213df6fa9). |
|
1346 what do you want to do? l |
1341 subrepository t diverged (local revision: e95bcfa18a35, remote revision: 52c0adc0515a) |
1347 subrepository t diverged (local revision: e95bcfa18a35, remote revision: 52c0adc0515a) |
1342 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
1348 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
|
1349 what do you want to do? m |
1343 subrepository sources for t differ |
1350 subrepository sources for t differ |
1344 use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a)? l |
1351 you can use (l)ocal source (e95bcfa18a35) or (r)emote source (52c0adc0515a). |
|
1352 what do you want to do? l |
1345 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1353 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1346 $ hg id |
1354 $ hg id |
1347 925c17564ef8+ tip |
1355 925c17564ef8+ tip |
1348 $ hg -R s id |
1356 $ hg -R s id |
1349 fc627a69481f+ |
1357 fc627a69481f+ |
1366 $ hg update -r 2 |
1374 $ hg update -r 2 |
1367 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1375 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1368 $ cd .. |
1376 $ cd .. |
1369 $ hg update 10 |
1377 $ hg update 10 |
1370 subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) |
1378 subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) |
1371 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
1379 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
|
1380 what do you want to do? m |
1372 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 20a0db6fbf6c) |
1381 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 20a0db6fbf6c) |
1373 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
1382 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
|
1383 what do you want to do? m |
1374 subrepository sources for t differ (in checked out version) |
1384 subrepository sources for t differ (in checked out version) |
1375 use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c)? l |
1385 you can use (l)ocal source (7af322bc1198) or (r)emote source (20a0db6fbf6c). |
|
1386 what do you want to do? l |
1376 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1387 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1377 $ hg id |
1388 $ hg id |
1378 e45c8b14af55+ |
1389 e45c8b14af55+ |
1379 $ hg -R s id |
1390 $ hg -R s id |
1380 02dcf1d70411 |
1391 02dcf1d70411 |
1392 02dcf1d70411+ |
1403 02dcf1d70411+ |
1393 $ hg -R t id |
1404 $ hg -R t id |
1394 7af322bc1198+ |
1405 7af322bc1198+ |
1395 $ hg update tip |
1406 $ hg update tip |
1396 subrepository s diverged (local revision: 12a213df6fa9, remote revision: 12a213df6fa9) |
1407 subrepository s diverged (local revision: 12a213df6fa9, remote revision: 12a213df6fa9) |
1397 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
1408 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
|
1409 what do you want to do? m |
1398 subrepository sources for s differ |
1410 subrepository sources for s differ |
1399 use (l)ocal source (02dcf1d70411) or (r)emote source (12a213df6fa9)? l |
1411 you can use (l)ocal source (02dcf1d70411) or (r)emote source (12a213df6fa9). |
|
1412 what do you want to do? l |
1400 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 52c0adc0515a) |
1413 subrepository t diverged (local revision: 52c0adc0515a, remote revision: 52c0adc0515a) |
1401 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
1414 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
|
1415 what do you want to do? m |
1402 subrepository sources for t differ |
1416 subrepository sources for t differ |
1403 use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a)? l |
1417 you can use (l)ocal source (7af322bc1198) or (r)emote source (52c0adc0515a). |
|
1418 what do you want to do? l |
1404 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1419 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1405 $ hg id |
1420 $ hg id |
1406 925c17564ef8+ tip |
1421 925c17564ef8+ tip |
1407 $ hg -R s id |
1422 $ hg -R s id |
1408 02dcf1d70411+ |
1423 02dcf1d70411+ |
1424 $ hg update fc627a69481f |
1439 $ hg update fc627a69481f |
1425 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1440 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1426 $ cd .. |
1441 $ cd .. |
1427 $ hg update 11 |
1442 $ hg update 11 |
1428 subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) |
1443 subrepository s diverged (local revision: 12a213df6fa9, remote revision: fc627a69481f) |
1429 (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m |
1444 you can (m)erge, keep (l)ocal [working copy] or keep (r)emote [destination]. |
|
1445 what do you want to do? m |
1430 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1446 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1431 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1447 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1432 $ hg id -n |
1448 $ hg id -n |
1433 11+ |
1449 11+ |
1434 $ hg -R s id |
1450 $ hg -R s id |