706   searching for changes

   706   searching for changes

   707   adding changesets

   707   adding changesets

   708   adding manifests

   708   adding manifests

   709   adding file changes

   709   adding file changes

   710   added 1 changesets with 1 changes to 1 files

   710   added 1 changesets with 1 changes to 1 files

   711   (run 'hg update' to get a working copy)

   712   (run 'hg update' to get a working copy)

   712 

   713 

   713 should pull t

   714 should pull t

   714 

   715 

   715   $ hg incoming -S -r `hg log -r tip -T "{node|short}"`

   716   $ hg incoming -S -r `hg log -r tip -T "{node|short}"`

   735   searching for changes

   736   searching for changes

   736   adding changesets

   737   adding changesets

   737   adding manifests

   738   adding manifests

   738   adding file changes

   739   adding file changes

   739   added 1 changesets with 1 changes to 1 files

   740   added 1 changesets with 1 changes to 1 files

   740   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   742   0 files updated, 0 files merged, 0 files removed, 0 files unresolved

   741   updated to "925c17564ef8: 13"

   743   updated to "925c17564ef8: 13"

   742   2 other heads for branch "default"

   744   2 other heads for branch "default"

   743   $ cat t/t

   745   $ cat t/t

   744   blah

   746   blah

  1051   requesting all changes

  1053   requesting all changes

  1052   adding changesets

  1054   adding changesets

  1053   adding manifests

  1055   adding manifests

  1054   adding file changes

  1056   adding file changes

  1055   added 2 changesets with 3 changes to 2 files

  1057   added 2 changesets with 3 changes to 2 files

  1056   (run 'hg update' to get a working copy)

  1059   (run 'hg update' to get a working copy)

  1057   $ hg -R issue1852b update

  1060   $ hg -R issue1852b update

  1058   abort: default path for subrepository not found (in subrepository "sub/repo") (glob)

  1061   abort: default path for subrepository not found (in subrepository "sub/repo") (glob)

  1059   [255]

  1062   [255]

  1060 

  1063 

  1077   pulling from issue1852a

  1080   pulling from issue1852a

  1078   adding changesets

  1081   adding changesets

  1079   adding manifests

  1082   adding manifests

  1080   adding file changes

  1083   adding file changes

  1081   added 1 changesets with 2 changes to 2 files

  1084   added 1 changesets with 2 changes to 2 files

  1082   cloning subrepo sub/repo from issue1852a/sub/repo (glob)

  1086   cloning subrepo sub/repo from issue1852a/sub/repo (glob)

  1083   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  1087   2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  1084 

  1088 

  1085 Try to push from the other side

  1089 Try to push from the other side

  1086 

  1090 

  1138   searching for changes

  1142   searching for changes

  1139   adding changesets

  1143   adding changesets

  1140   adding manifests

  1144   adding manifests

  1141   adding file changes

  1145   adding file changes

  1142   added 1 changesets with 2 changes to 2 files

  1146   added 1 changesets with 2 changes to 2 files

  1143    subrepository sub/repo diverged (local revision: f42d5c7504a8, remote revision: 46cd4aac504c)

  1148    subrepository sub/repo diverged (local revision: f42d5c7504a8, remote revision: 46cd4aac504c)

  1144   (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m

  1149   (M)erge, keep (l)ocal [working copy] or keep (r)emote [destination]? m

  1145   pulling subrepo sub/repo from $TESTTMP/issue1852a/sub/repo (glob)

  1150   pulling subrepo sub/repo from $TESTTMP/issue1852a/sub/repo (glob)

  1146   searching for changes

  1151   searching for changes

  1147   adding changesets

  1152   adding changesets

  1148   adding manifests

  1153   adding manifests

  1149   adding file changes

  1154   adding file changes

  1150   added 1 changesets with 1 changes to 1 files

  1155   added 1 changesets with 1 changes to 1 files

  1151    subrepository sources for sub/repo differ (glob)

  1157    subrepository sources for sub/repo differ (glob)

  1152   use (l)ocal source (f42d5c7504a8) or (r)emote source (46cd4aac504c)? l

  1158   use (l)ocal source (f42d5c7504a8) or (r)emote source (46cd4aac504c)? l

  1153   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  1159   1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  1154   $ cat issue1852d/.hgsubstate

  1160   $ cat issue1852d/.hgsubstate

  1155   f42d5c7504a811dda50f5cf3e5e16c3330b87172 sub/repo

  1161   f42d5c7504a811dda50f5cf3e5e16c3330b87172 sub/repo