Hi Thomas, Thomas Schwinge <tho...@schwinge.name> skribis:
> On Thu, 13 Oct 2011 17:16:59 +0200, I wrote: >> On Wed, 23 Mar 2011 14:30:17 +0100, l...@gnu.org (Ludovic >> =?iso-8859-1?Q?Court=E8s?=) wrote: >> > A further complication is that ‘tg remote --populate’ did not fetch the >> > ‘baseline’ branch, which is consequently reported as a missing >> > dependency. Running ‘git branch --track baseline origin/baseline’ >> > solves the problem, [...]. >> > >> > Any suggestions? >> >> I could perhaps turn baseline into a TopGit branch, and have it depend on >> a commit via a SHA1. I'll have to think about this some more. > > That's what I have done now. As we two are the only users of this (as > far as I know), I didn't spend any time on a graceful transitioning > methond: please delete your local baseline branch, and have TopGit > (re-)create it from the Savannah repository. Does that work better > now? Yes, Hydra is now referring to ‘baseline’ by name, which is an improvement. :-) In related issues, I’m still failing to do this: --8<---------------cut here---------------start------------->8--- $ tg export --linearize for-upstream-glibc Already up-to-date! skip empty commit baseline Already up-to-date! skip empty commit baseline exported commit t/init-first.c Already up-to-date! skip empty commit baseline exported commit t/kernel-features.h_includes Already up-to-date! skip empty commit baseline exported commit t/libc_once [...] skip empty commit t/socketpair_flags exported commit t/pipe2 Already up-to-date! skip empty commit baseline Auto-merging sysdeps/mach/hurd/kernel-features.h CONFLICT (content): Merge conflict in sysdeps/mach/hurd/kernel-features.h fix up the merge and update the index. Don't commit! sh-4.2$ --8<---------------cut here---------------end--------------->8--- This is on a pristine clone at d740cf9d201dc9ecb0335b0a585828dea9cce793. Besides, the part of the Savannah patch that touches sysdeps/i386/configure fails to apply to Sourceware’s glibc (unsurprisingly): <http://hydra.nixos.org/build/1483499>. Thanks! Ludo’.
