Home » Mailing list archives » git » 2007 » April » 25

using stgit/guilt for public branches

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Michael S. Tsirkin <mst@...>
To: Junio C Hamano <junkio@...>, Catalin Marinas <catalin.marinas@...>, <git@...>, Josef 'Jeff' Sipek <jsipek@...>
Subject: using stgit/guilt for public branches
Date: Wednesday, April 25, 2007 - 8:20 am

Hi!
On git.openfabrics.org we use git to manage all code for our OFED distribution.
For our kernel code we basically started with 2.6.20, and add some patches,
which we currently keep separate from upstream kernel source - this makes
it possible to update from upstream and extract the patches to post
them for upstream inclusion easily.

On the surface, it looks like using stg or guilt would be a good idea for us,
however multiple people need to collaborate on the patch series.

I am concerned that publishing a git branch managed by stg/guilt
would present problems: it seems that every time patches are re-ordered,
a patch is re-written or removed, or we update from upstream,
everyone who pulls the tree branch will have a hard-to-resolve conflict.

Is that really a problem? If so, would it be possible to work around this somehow?

Thanks,

-- 
MST
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
using stgit/guilt for public branches, Michael S. Tsirkin, (Wed Apr 25, 8:20 am)
Re: using stgit/guilt for public branches, Josef Sipek, (Wed Apr 25, 3:18 pm)
Re: using stgit/guilt for public branches, Robin Rosenberg, (Wed Apr 25, 5:37 pm)
Re: using stgit/guilt for public branches, Yann Dirson, (Thu May 3, 4:58 pm)
Re: using stgit/guilt for public branches, Yann Dirson, (Fri May 4, 7:12 pm)
Re: using stgit/guilt for public branches, Michael S. Tsirkin, (Fri May 4, 1:20 am)
Re: using stgit/guilt for public branches, Yann Dirson, (Fri May 4, 5:37 pm)
Re: using stgit/guilt for public branches, Robin Rosenberg, (Thu May 3, 7:10 pm)
Re: using stgit/guilt for public branches, Robin Rosenberg, (Thu May 3, 7:31 pm)
Re: using stgit/guilt for public branches, Yann Dirson, (Fri May 4, 5:28 pm)
Re: using stgit/guilt for public branches, Michael S. Tsirkin, (Wed Apr 25, 3:52 pm)
Re: using stgit/guilt for public branches, Josef Sipek, (Wed Apr 25, 4:40 pm)