equal
deleted
inserted
replaced
26 $ hg up -C -R sub null |
26 $ hg up -C -R sub null |
27 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
27 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
28 $ hg up -C -R main null |
28 $ hg up -C -R main null |
29 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
29 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
30 $ rm -rf main/sub |
30 $ rm -rf main/sub |
|
31 |
|
32 hide outer repo |
|
33 $ hg init |
31 |
34 |
32 Serving them both using hgweb |
35 Serving them both using hgweb |
33 |
36 |
34 $ printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf |
37 $ printf '[paths]\n/main = main\nsub = sub\n' > webdir.conf |
35 $ hg serve --webdir-conf webdir.conf -a localhost -p $HGPORT \ |
38 $ hg serve --webdir-conf webdir.conf -a localhost -p $HGPORT \ |