<P>why don't you guys use stg (stacked git)</P>
<P>it allows you to manage a set of patches, with features like :</P>
<P>- re-edit an existing one (basically, you push/pull a set of patches from a stack, and decide which one to use)</P>
<P>- you get the upside of git, without the down side (ie a commit is done only once) (but you can still commit a patch - in git sense ; but you'll get back Mike's first point about pull/fetch discussion)</P>
<P>- you don't need to rebase (it does it for you)</P>
<P>- you don't need to coalesce patches (as you can reedit an existing one)</P>
<P>- it's compatible with some other tools (like qgit)<BR><BR>basically, I switched to stg - on top of git - when I got my tree messed up twice by updates...</P>
<P>If you go for stg, I also recommend the bash completion extension which is very helpful (for patch name's management)<BR><BR>my 2 cents<BR></P>
<BLOCKQUOTE style="PADDING-LEFT: 5px; MARGIN-LEFT: 5px; BORDER-LEFT: #ff0000 2px solid">> Message du 18/01/06 17:39<BR>> De : "Robert Shearman" <ROB@CODEWEAVERS.COM><BR>> A : "Mike McCormack" <MIKE@CODEWEAVERS.COM><BR>> Copie à : "Wine Devel" <WINE-DEVEL@WINEHQ.ORG><BR>> Objet : Re: GIT rebase changes<BR>> <BR>> Mike McCormack wrote:<BR>> <BR>> ><BR>> > Hi GIT users,<BR>> ><BR>> > The GIT guys have made rebase and pull incompatible, and to use rebase <BR>> > (which is likely what we want to do for Wine), you must use "fetch" <BR>> > then "rebase", not "pull" (which does a merge).<BR>> <BR>> <BR>> And on a slightly related note, I wrote a script which works kinda like <BR>> rebase (and is based on the old version of rebase) that allows you to <BR>> coalesce two patches in your tree. This is useful in two situations:<BR>> 1. You commit a new feature and then realise after some extensive <BR>> testing that there is a bug, so you commit a fix, don't want to send the <BR>> two separate patches to wine-patches (maybe to save face :-), or maybe <BR>> to reduce noise).<BR>> 2. You revert a patch in your tree but don't want both the revert and <BR>> the old patch in your patch queue as shown by git-format-patch or by <BR>> Mike's mm-send-patch.<BR>> <BR>> Note that the first commit chronologically must be the first commit on <BR>> the command line.<BR>> <BR>> -- <BR>> Rob Shearman<BR>> <BR>> ><BR>> [ rob-git-coalesce-patches (2.5 Ko) ]<BR>> [ (pas de nom de fichier) (0.0 Ko) ]</BLOCKQUOTE>