Mercurial > hg-stable
view tests/test-subrepo-git.t @ 12993:a91334380699
subrepo: cloning and updating of git subrepos
gitsubrepo based on patch from David Soria Parra:
http://bitbucket.org/segv/davids-poor-git-subrepo-attempt/
| author | Eric Eisner <ede@mit.edu> |
|---|---|
| date | Sun, 14 Nov 2010 18:20:13 -0500 |
| parents | 2b73a3279a9f |
| children | 845c602b8635 |
line wrap: on
line source
$ "$TESTDIR/hghave" git || exit 80 make git commits repeatable $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL $ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE root hg repo $ hg init t $ cd t $ echo a > a $ hg add a $ hg commit -m a $ cd .. new external git repo $ mkdir gitroot $ cd gitroot $ git init -q $ echo g > g $ git add g $ git commit -q -m g add subrepo clone $ cd ../t $ echo 's = [git]../gitroot' > .hgsub $ git clone -q ../gitroot s $ hg add .hgsub $ hg commit -m 'new git subrepo' committing subrepository $TESTTMP/t/s $ hg debugsub path s source ../gitroot revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7 record a new commit from upstream $ cd ../gitroot $ echo gg >> g $ git commit -q -a -m gg $ cd ../t/s $ git pull -q $ cd .. $ hg commit -m 'update git subrepo' committing subrepository $TESTTMP/t/s $ hg debugsub path s source ../gitroot revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a clone root $ hg clone . ../tc updating to branch default cloning subrepo s 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd ../tc $ hg debugsub path s source ../gitroot revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a update to previous substate $ hg update 1 checking out detached HEAD in subrepo s check out a git branch if you intend to make changes 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat s/g g $ hg debugsub path s source ../gitroot revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7