Re: "Branch objects" (was: Re: cherry picking and merge)

From: Tony Finch <dot@dotat.at>
Date: Aug 7, 2014, 16:42 UTC
Message-ID: <alpine.LSU.2.00.1408071735410.23775@hermes-1.csi.cam.ac.uk>
In-Reply-To: <20140807155828.GM23449@localhost>

Nico Williams <nico@cryptonector.com> wrote:

Show 9 quoted lines

> On Thu, Aug 07, 2014 at 12:38:48PM +0100, Tony Finch wrote:
>
> > But [a rebasing workflow] is inconvenient for deploying the patched
> > version to production (which is the point of developing the fixes) - I
> > want a fast-forwarding branch for that.
>
> I'm not sure I follow this.  You deploy what you build, and you build
> the HEAD of the production branch, whatever that is.  If it gets
> rebased, so it it does.

The problem is that the production branch gets copied around: pushed to the repo server, pulled by other team members, etc. Forced pushes are accident-prone, as is resetting a rebased branch after a pull.

Show 7 quoted lines

> > So I have a small tool which maintains a publication branch which
> > tracks the head of a rebasing branch. It's reasonably satisfactory so
> > far...
> >
> > https://git.csx.cam.ac.uk/x/ucs/git/git-repub.git
>
> Yeah, that's useful.

Glad you think so :-)

Tony.

-- 
f.anthony.n.finch  <dot@dotat.at>  http://dotat.at/
Thames: Northeast veering southeast 4 or 5, occasionally 6. Slight, becoming
slight or moderate. Fair then rain or thundery showers. Good, becoming
moderate or poor for a time.