[cig-commits] commit: test nested repo in otherwise empty directory

[Mercurial]

changeset:   36:01a10f7bd85c
user:        Robin Farine <robin.farine at terminus.org>
date:        Thu Dec 21 15:05:23 2006 +0100
files:       test-forest test-forest.out
description:
test nested repo in otherwise empty directory


diff -r 4e6c1a940dbe -r 01a10f7bd85c test-forest
--- a/test-forest	Mon Dec 18 21:48:13 2006 +0000
+++ b/test-forest	Thu Dec 21 15:05:23 2006 +0100
@@ -19,10 +19,14 @@ echo "t/f" > toplevel/t/f
 echo "t/f" > toplevel/t/f
 hg init toplevel/t/t
 echo "t/t/f" > toplevel/t/t/f
+mkdir toplevel/e
+hg init toplevel/e/d
+echo "e/d/f" > toplevel/e/d/f
 hg commit --cwd toplevel -A -m "start" -d "0 0"
 hg commit --cwd toplevel/d/d/t -A -m "start" -d "0 0"
 hg commit --cwd toplevel/t -A -m "start" -d "0 0"
 hg commit --cwd toplevel/t/t -A -m "start" -d "0 0"
+hg commit --cwd toplevel/e/d -A -m "start" -d "0 0"
 
 echo "# ftrees"
 hg ftrees --convert --cwd toplevel
diff -r 4e6c1a940dbe -r 01a10f7bd85c test-forest.out
--- a/test-forest.out	Mon Dec 18 21:48:13 2006 +0000
+++ b/test-forest.out	Thu Dec 21 15:05:23 2006 +0100
@@ -5,9 +5,11 @@ adding f
 adding f
 adding f
 adding f
+adding f
 # ftrees
 .
 d/d/t
+e/d
 t
 t/t
 # fstatus
@@ -16,6 +18,8 @@ t/t
 [d/d/t]
 M f
 
+[e/d]
+
 [t]
 
 [t/t]
@@ -25,6 +29,8 @@ M f
 
 [d/d/t]
 
+[e/d]
+
 [t]
 
 [t/t]
@@ -34,6 +40,9 @@ 3 files updated, 0 files merged, 0 files
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [d/d/t]
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[e/d]
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 [t]
@@ -54,18 +63,22 @@ adding d/d/f2
  
  [tree1.paths]
  
-@@ -18,7 +18,7 @@
- 
- [tree4]
+@@ -24,7 +24,7 @@
+ 
+ [tree5]
  root = t/t
 -revision = 5d60830890a20c050332e222b8307bbb70940a3f
 +revision = e7ef7301b2ddca4eca0c4e80fe0cc8c943d05645
  
- [tree4.paths]
+ [tree5.paths]
  
 # fseed
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 [d/d/t]
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[e/d]
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
@@ -92,17 +105,24 @@ default = HGTMP/test-forest/toplevel/d/d
 default = HGTMP/test-forest/toplevel/d/d/t
 
 [tree3]
+root = e/d
+revision = 87ae3032128b3306de675b7b390bc7b594ed74eb
+
+[tree3.paths]
+default = HGTMP/test-forest/toplevel/e/d
+
+[tree4]
 root = t
 revision = 37c7c7838b045dddb0718588a6318f002f0bed0a
 
-[tree3.paths]
+[tree4.paths]
 default = HGTMP/test-forest/toplevel/t
 
-[tree4]
+[tree5]
 root = t/t
 revision = 5d60830890a20c050332e222b8307bbb70940a3f
 
-[tree4.paths]
+[tree5.paths]
 default = HGTMP/test-forest/toplevel/t/t
 
 # fpull
@@ -120,6 +140,11 @@ searching for changes
 searching for changes
 no changes found
 
+[e/d]
+pulling from HGTMP/test-forest/toplevel/e/d
+searching for changes
+no changes found
+
 [t]
 pulling from HGTMP/test-forest/toplevel/t
 searching for changes
@@ -148,6 +173,11 @@ searching for changes
 searching for changes
 no changes found
 
+[e/d]
+pushing to HGTMP/test-forest/toplevel/e/d
+searching for changes
+no changes found
+
 [t]
 pushing to HGTMP/test-forest/toplevel/t
 searching for changes
@@ -166,26 +196,36 @@ 3 files updated, 0 files merged, 0 files
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
-[t]
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-[t/t]
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-.
-t
-t/t
-[t]
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-[t/t]
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-.
+[e/d]
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[t]
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[t/t]
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+.
+e/d
+t
+t/t
+[e/d]
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[t]
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+[t/t]
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+.
+e/d
 t
 t/t
 [.]
@@ -197,6 +237,11 @@ added 3 changesets with 4 changes to 4 f
 added 3 changesets with 4 changes to 4 files
 (run 'hg update' to get a working copy)
 
+[e/d]
+pulling from HGTMP/test-forest/toplevel/e/d
+searching for changes
+no changes found
+
 [t]
 pulling from HGTMP/test-forest/toplevel/t
 searching for changes
@@ -216,6 +261,10 @@ 1 files updated, 0 files merged, 0 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
+[e/d]
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
 [t]
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -226,6 +275,7 @@ 1 files updated, 0 files merged, 0 files
 
 .
 d/d/t
+e/d
 t
 t/t
 [.]
@@ -238,6 +288,11 @@ searching for changes
 searching for changes
 no changes found
 
+[e/d]
+pulling from HGTMP/test-forest/toplevel/e/d
+searching for changes
+no changes found
+
 [t]
 pulling from HGTMP/test-forest/toplevel/t
 searching for changes
@@ -252,6 +307,8 @@ no changes found
 [.]
 
 [d/d/t]
+
+[e/d]
 
 [t] *mq*
 
@@ -272,6 +329,11 @@ searching for changes
 searching for changes
 no changes found
 
+[e/d]
+pulling from HGTMP/test-forest/toplevel/e/d
+searching for changes
+no changes found
+
 [t]
 skipped, mq patches applied
 
@@ -291,6 +353,11 @@ searching for changes
 searching for changes
 no changes found
 
+[e/d]
+pushing to HGTMP/test-forest/toplevel/e/d
+searching for changes
+no changes found
+
 [t]
 skipped, mq patches applied