equal
deleted
inserted
replaced
9 Preparing the 'sub1' repo which depends on the subrepo 'sub2' |
9 Preparing the 'sub1' repo which depends on the subrepo 'sub2' |
10 |
10 |
11 $ hg init sub1 |
11 $ hg init sub1 |
12 $ echo sub1 > sub1/sub1 |
12 $ echo sub1 > sub1/sub1 |
13 $ echo "sub2 = ../sub2" > sub1/.hgsub |
13 $ echo "sub2 = ../sub2" > sub1/.hgsub |
14 $ hg clone sub2 sub1/sub2 | sed 's/ .*sub/ ...sub/g' |
14 $ hg clone sub2 sub1/sub2 |
15 updating to branch default |
15 updating to branch default |
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
17 $ hg add -R sub1 |
17 $ hg add -R sub1 |
18 adding sub1/.hgsub |
18 adding sub1/.hgsub |
19 adding sub1/sub1 |
19 adding sub1/sub1 |
23 Preparing the 'main' repo which depends on the subrepo 'sub1' |
23 Preparing the 'main' repo which depends on the subrepo 'sub1' |
24 |
24 |
25 $ hg init main |
25 $ hg init main |
26 $ echo main > main/main |
26 $ echo main > main/main |
27 $ echo "sub1 = ../sub1" > main/.hgsub |
27 $ echo "sub1 = ../sub1" > main/.hgsub |
28 $ hg clone sub1 main/sub1 | sed 's/ .*sub/ ...sub/g' |
28 $ hg clone sub1 main/sub1 |
29 updating to branch default |
29 updating to branch default |
30 pulling ...sub2 |
30 pulling subrepo sub2 from .*/sub2 |
31 requesting all changes |
31 requesting all changes |
32 adding changesets |
32 adding changesets |
33 adding manifests |
33 adding manifests |
34 adding file changes |
34 adding file changes |
35 added 1 changesets with 1 changes to 1 files |
35 added 1 changesets with 1 changes to 1 files |
51 $ rm -rf main/sub1 |
51 $ rm -rf main/sub1 |
52 $ rm -rf sub1/sub2 |
52 $ rm -rf sub1/sub2 |
53 |
53 |
54 Clone main |
54 Clone main |
55 |
55 |
56 $ hg clone main cloned | sed 's/ .*sub/ ...sub/g' |
56 $ hg clone main cloned |
57 updating to branch default |
57 updating to branch default |
58 pulling ...sub1 |
58 pulling subrepo sub1 from .*/sub1 |
59 requesting all changes |
59 requesting all changes |
60 adding changesets |
60 adding changesets |
61 adding manifests |
61 adding manifests |
62 adding file changes |
62 adding file changes |
63 added 1 changesets with 3 changes to 3 files |
63 added 1 changesets with 3 changes to 3 files |
64 pulling ...sub2 |
64 pulling subrepo sub1/sub2 from .*/sub2 |
65 requesting all changes |
65 requesting all changes |
66 adding changesets |
66 adding changesets |
67 adding manifests |
67 adding manifests |
68 adding file changes |
68 adding file changes |
69 added 1 changesets with 1 changes to 1 files |
69 added 1 changesets with 1 changes to 1 files |