diff options
| -rw-r--r-- | source_repositories/glibc.mdwn | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/source_repositories/glibc.mdwn b/source_repositories/glibc.mdwn index 5530980e..fabd7cab 100644 --- a/source_repositories/glibc.mdwn +++ b/source_repositories/glibc.mdwn @@ -16,3 +16,78 @@ This repository uses [[TopGit]]. *A plan for the Hurd-specific glibc repository*, thread [begins](http://lists.gnu.org/archive/html/bug-hurd/2010-01/msg00062.html), [continues](http://lists.gnu.org/archive/html/bug-hurd/2010-02/msg00021.html). + + +# Usage + +## Clone + + $ git init + $ git remote add savannah git://git.sv.gnu.org/hurd/glibc.git + $ git remote update + $ tg remote --populate savannah + tg: Remote savannah can now follow TopGit topic branches. + tg: Populating local topic branches from remote 'savannah'... + From git://git.sv.gnu.org/hurd/glibc + * [new branch] refs/top-bases/t/_dl_random -> savannah/top-bases/t/_dl_random + * [new branch] refs/top-bases/t/accept4 -> savannah/top-bases/t/accept4 + [...] + * [new branch] refs/top-bases/tschwinge/Roger_Whittaker -> savannah/top-bases/tschwinge/Roger_Whittaker + tg: Adding branch t/_dl_random... + tg: Adding branch t/accept4... + [...] + tg: Adding branch tschwinge/Roger_Whittaker... + tg: The remote 'savannah' is now the default source of topic branches. + +## Use tschwinge's Working Branch + + $ git checkout tschwinge/Roger_Whittaker + +## Integrate a New Branch + +A new (TopGit) branch has been published upstream: + + $ tg remote --populate savannah + tg: Remote savannah can now follow TopGit topic branches. + tg: Populating local topic branches from remote 'savannah'... + remote: Counting objects: 28, done. + remote: Compressing objects: 100% (19/19), done. + remote: Total 20 (delta 13), reused 1 (delta 0) + Unpacking objects: 100% (20/20), done. + From git://git.sv.gnu.org/hurd/glibc + * [new branch] t/unwind-resume.c -> savannah/t/unwind-resume.c + * [new branch] refs/top-bases/t/unwind-resume.c -> savannah/top-bases/t/unwind-resume.c + tg: Skipping branch t/____longjmp_chk: Already exists + [...] + tg: Skipping branch t/tlsdesc.sym: Already exists + tg: Adding branch t/unwind-resume.c... + tg: Skipping branch t/verify.h: Already exists + tg: Skipping branch tschwinge/Roger_Whittaker: Already exists + tg: The remote 'savannah' is now the default source of topic branches. + +Make `tschwinge/Roger_Whittaker` (the current branch) depend on it: + + $ tg depend add t/unwind-resume.c + [tschwinge/Roger_Whittaker 63f11ff] New TopGit dependency: t/unwind-resume.c + 1 files changed, 1 insertions(+), 0 deletions(-) + tg: Updating base with t/unwind-resume.c changes... + Auto-merging .topdeps + Auto-merging .topmsg + Merge made by recursive. + nptl/sysdeps/pthread/Makefile | 12 ++---------- + sysdeps/gnu/Makefile | 18 ++++++++++++++++-- + .../pthread => sysdeps/gnu}/rt-unwind-resume.c | 0 + .../pthread => sysdeps/gnu}/unwind-resume.c | 4 ++-- + 4 files changed, 20 insertions(+), 14 deletions(-) + rename {nptl/sysdeps/pthread => sysdeps/gnu}/rt-unwind-resume.c (100%) + rename {nptl/sysdeps/pthread => sysdeps/gnu}/unwind-resume.c (93%) + tg: The tschwinge/Roger_Whittaker head is up-to-date wrt. its remote branch. + tg: Updating tschwinge/Roger_Whittaker against new base... + Merge made by recursive. + nptl/sysdeps/pthread/Makefile | 12 ++---------- + sysdeps/gnu/Makefile | 18 ++++++++++++++++-- + .../pthread => sysdeps/gnu}/rt-unwind-resume.c | 0 + .../pthread => sysdeps/gnu}/unwind-resume.c | 4 ++-- + 4 files changed, 20 insertions(+), 14 deletions(-) + rename {nptl/sysdeps/pthread => sysdeps/gnu}/rt-unwind-resume.c (100%) + rename {nptl/sysdeps/pthread => sysdeps/gnu}/unwind-resume.c (93%) |