equal
deleted
inserted
replaced
237 clone |
237 clone |
238 |
238 |
239 $ cd .. |
239 $ cd .. |
240 $ hg clone t tc |
240 $ hg clone t tc |
241 updating to branch default |
241 updating to branch default |
242 pulling subrepo s from $TESTTMP/sub/t/s |
242 cloning subrepo s from $TESTTMP/sub/t/s |
243 requesting all changes |
243 cloning subrepo s/ss from $TESTTMP/sub/t/s/ss |
244 adding changesets |
244 cloning subrepo t from $TESTTMP/sub/t/t |
245 adding manifests |
|
246 adding file changes |
|
247 added 4 changesets with 5 changes to 3 files |
|
248 pulling subrepo s/ss from $TESTTMP/sub/t/s/ss |
|
249 requesting all changes |
|
250 adding changesets |
|
251 adding manifests |
|
252 adding file changes |
|
253 added 1 changesets with 1 changes to 1 files |
|
254 pulling subrepo t from $TESTTMP/sub/t/t |
|
255 requesting all changes |
|
256 adding changesets |
|
257 adding manifests |
|
258 adding file changes |
|
259 added 4 changesets with 4 changes to 1 files (+1 heads) |
|
260 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
245 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
261 $ cd tc |
246 $ cd tc |
262 $ hg debugsub |
247 $ hg debugsub |
263 path s |
248 path s |
264 source s |
249 source s |
561 $ hg -R repo ci -Am1 |
546 $ hg -R repo ci -Am1 |
562 adding .hgsub |
547 adding .hgsub |
563 committing subrepository s |
548 committing subrepository s |
564 $ hg clone repo repo2 |
549 $ hg clone repo repo2 |
565 updating to branch default |
550 updating to branch default |
566 pulling subrepo s from $TESTTMP/sub/repo/s |
551 cloning subrepo s from $TESTTMP/sub/repo/s |
567 requesting all changes |
|
568 adding changesets |
|
569 adding manifests |
|
570 adding file changes |
|
571 added 1 changesets with 1 changes to 1 files |
|
572 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
552 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
573 $ hg -q -R repo2 pull -u |
553 $ hg -q -R repo2 pull -u |
574 $ echo 1 > repo2/s/a |
554 $ echo 1 > repo2/s/a |
575 $ hg -R repo2/s ci -m2 |
555 $ hg -R repo2/s ci -m2 |
576 $ hg -q -R repo2/s push |
556 $ hg -q -R repo2/s push |
637 pulling from issue1852a |
617 pulling from issue1852a |
638 adding changesets |
618 adding changesets |
639 adding manifests |
619 adding manifests |
640 adding file changes |
620 adding file changes |
641 added 1 changesets with 2 changes to 2 files |
621 added 1 changesets with 2 changes to 2 files |
642 pulling subrepo sub/repo from issue1852a/sub/repo |
622 cloning subrepo sub/repo from issue1852a/sub/repo |
643 requesting all changes |
|
644 adding changesets |
|
645 adding manifests |
|
646 adding file changes |
|
647 added 2 changesets with 2 changes to 1 files |
|
648 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
623 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
649 |
624 |
650 Try to push from the other side |
625 Try to push from the other side |
651 |
626 |
652 $ hg -R issue1852a push `pwd`/issue1852c |
627 $ hg -R issue1852a push `pwd`/issue1852c |