bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: new branch in gnulib: coreutils-8.9


From: Jim Meyering
Subject: Re: new branch in gnulib: coreutils-8.9
Date: Tue, 04 Jan 2011 21:05:59 +0100

Ralf Wildenhues wrote:
> Hi Jim,
>
> * Jim Meyering wrote on Tue, Jan 04, 2011 at 07:14:49PM CET:
>> In releasing coreutils-8.9, I left its gnulib submodule pointing at a
>> private commit that was going to be pushed, pending an ACK...  Since a
>> slightly different commit was pushed, coreutils' submodule SHA1 was
>> invalid for a short interval.  However, I have pushed my local commit
>> to the new gnulib branch named "coreutils-8.9".  With that, anyone
>> cloning coreutils and trying to build from the 8.9 tag *will* get a
>> usable gnulib hierarchy.
>
> FYI, this would have also been a good point at which you could have
> merged the commit used for coreutils into the gnulib master branch.
> Even a fake merge 'git merge -s ours coreutils-8.9' would be
> appropriate, if the end result is semantically that the effects of your
> patch are incorporated in the tree.
>
> You could still do this.
>
> That way, the next update of gnulib as coreutils submodule could still
> be a fast-forward.

Hi Ralf,

I've done as you suggest (note that it required temporarily
disabling the hook that prohibits pushing merge commits to master).
That has the added benefit that the branch is no longer needed.

Thanks for the suggestion,

Jim



reply via email to

[Prev in Thread] Current Thread [Next in Thread]