Mercurial > hg > hgforest
view test-forest.out @ 62:5d770477eb1a
`hg fclone` now behaves much like `hg clone`
author | Simon Law <simon@akoha.org> |
---|---|
date | Mon, 27 Aug 2007 13:40:21 -0400 |
parents | df4e33bd7149 |
children | 95a1f9aab6ab |
line wrap: on
line source
# setup initial forest adding d/d/f adding d/f adding f adding f adding f adding f adding f # ftrees . d/d/t e/d t t/t # fstatus [.] [d/d/t] M f [e/d] [t] [t/t] ? f2 [.] [d/d/t] [e/d] [t] [t/t] # fclone [.] 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] 1 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 # fsnap adding d/d/f2 --- top-snap1 +++ top-snap2 @@ -1,6 +1,6 @@ [tree1] root = . -revision = fccf42f55033a9715e9e990fcc1749e3d0d19d39 +revision = bc7d06dbb331e93b327d848dc724e61cd2dc2d66 [tree1.paths] @@ -24,7 +24,7 @@ [tree5] root = t/t -revision = 5d60830890a20c050332e222b8307bbb70940a3f +revision = e7ef7301b2ddca4eca0c4e80fe0cc8c943d05645 [tree5.paths] # fupdate changeset: 0:11d08ba64b67 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: start changeset: 0:5d60830890a2 user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: start changeset: 0:11d08ba64b67 tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: start changeset: 1:e7ef7301b2dd tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: new line # 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 [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 [tree1] root = . revision = fccf42f55033a9715e9e990fcc1749e3d0d19d39 [tree1.paths] default = HGTMP/test-forest/toplevel [tree2] root = d/d/t revision = 11d08ba64b676ed2f87a16089f3a0e5060c7bc36 [tree2.paths] 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 [tree4.paths] default = HGTMP/test-forest/toplevel/t [tree5] root = t/t revision = 5d60830890a20c050332e222b8307bbb70940a3f [tree5.paths] default = HGTMP/test-forest/toplevel/t/t # fpull [.] pulling from HGTMP/test-forest/toplevel searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [d/d/t] pulling from HGTMP/test-forest/toplevel/d/d/t 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 no changes found [t/t] pulling from HGTMP/test-forest/toplevel/t/t searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved # fpush [.] pushing to HGTMP/test-forest/toplevel searching for changes adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files [d/d/t] pushing to HGTMP/test-forest/toplevel/d/d/t 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 no changes found [t/t] pushing to HGTMP/test-forest/toplevel/t/t searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files # fseed and fpull, missing section [.] 3 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 [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 [.] pulling from HGTMP/test-forest/toplevel requesting all changes adding changesets adding manifests adding file changes 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 no changes found [t/t] pulling from HGTMP/test-forest/toplevel/t/t searching for changes no changes found # fseed and fpull, named section [.] 3 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 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 [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 . d/d/t e/d t t/t [.] pulling from HGTMP/test-forest/toplevel searching for changes no changes found [d/d/t] pulling from HGTMP/test-forest/toplevel/d/d/t 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 no changes found [t/t] pulling from HGTMP/test-forest/toplevel/t/t searching for changes no changes found # fstatus + mq [.] [d/d/t] [e/d] [t] *mq* [t/t] *mq* [t/t/.hg/patches] A .hgignore A mq-patch A series # fclone + mq [.] 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] skipped: 't' has mq patches applied [t/t] skipped: 't/t' has mq patches applied [t/t/.hg/patches] 0 files updated, 0 files merged, 0 files removed, 0 files unresolved # fsnap + mq abort: 't' has mq patches applied # fpull + mq [.] pulling from HGTMP/test-forest/toplevel searching for changes no changes found [d/d/t] pulling from HGTMP/test-forest/toplevel/d/d/t 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 [t/t] skipped, mq patches applied # fpush + mq [.] pushing to HGTMP/test-forest/toplevel searching for changes no changes found [d/d/t] pushing to HGTMP/test-forest/toplevel/d/d/t 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 [t/t] skipped, mq patches applied # walk **/.hg . a . .hg/h a a/.hg/h . .hg/h a a/.hg/h . a . a . a # circular trees [.] ? b [a] ? b ? c [a/a]