On Tue, Aug 04, 2009 at 05:25:06PM +0000, Frédéric Brière wrote:
> Guido Günther <a...@sigxcpu.org> wrote:
> > On Mon, May 25, 2009 at 10:52:42AM +0200, martin f krafft wrote:
> > > 1. due to the rebasing, it's not possible to work with other people,
> > >    unless everyone maintains their own patch queue.
> >
> > Not true. You just have to agree beforehand what branches do keep the
> > patch queues (therefore the patch-queue namespace) and you have to fetch
> > them with a refspec that starts with a plus sign (see git-fetch (1) and
> > look for <refspec>).
> While it's certainly possible to collaborate on a frequently-rebased
> branch, it requires much more than making git-fetch work (which will
> already be the case by default).  You'll have to adjust your
> remote-tracking branches manually (git-pull will not work), and you'll
> have to make sure you don't step on each other's toes, especially since
> you'll be pushing with --force.
> Come to think of it, if a collaborative effort is desired, it might be
> preferable to never publish the patch branches, but instead to recreate
> them each time from master's debian/patches, as Mehdi proposed.  You'll
> still have to take care not to overwrite someone else's changes, but at
> least you'll get notified if master has moved forward.
Sure. That's what I acutally do (and what gbp-pq[1] does). The whole point
was that you *can* push those branches if you want to.
 -- Guido

[1] https://honk.sigxcpu.org/piki/development/debian_packages_in_git/

vcs-pkg-discuss mailing list

Reply via email to