From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4825 invoked by alias); 23 Feb 2011 20:21:56 -0000 Mailing-List: contact archer-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: List-Id: Received: (qmail 4814 invoked by uid 22791); 23 Feb 2011 20:21:55 -0000 X-SWARE-Spam-Status: No, hits=-6.9 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org From: Tom Tromey To: "Pierre Muller" Cc: "'Joel Brobecker'" , Subject: Re: [Archer] Re: [Archer] Archer git account inquiry References: <00a901cbd1cb$01651880$042f4980$@muller@ics-cnrs.unistra.fr> <20110221142157.GF2617@adacore.com> <20110222042450.GJ2617@adacore.com> <20110223033007.GA19610@adacore.com> <000f01cbd339$32d6b6c0$98842440$@muller@ics-cnrs.unistra.fr> Date: Wed, 23 Feb 2011 20:21:00 -0000 In-Reply-To: <000f01cbd339$32d6b6c0$98842440$@muller@ics-cnrs.unistra.fr> (Pierre Muller's message of "Wed, 23 Feb 2011 10:08:12 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-SW-Source: 2011-q1/txt/msg00100.txt.bz2 Pierre> I don't really care about where I put my modifications, Pierre> if nobody is against it, archer repository is fine with me. It is perfectly ok. Pierre> Related question: should I change the wiki page Pierre> to add my branch? Do I need to logon somewhere for this? Yes, please document new branches on the wiki. You need an account on the wiki, you can make one there somehow. Pierre> Coming back to the primary reason of my request for git account: Pierre> I am mainly interested in an easier way to split Pierre> larges patches into several sub-patches like many of you Pierre> are doing. Pierre> So my main question is: Pierre> what do you use to create your email series with sub-patches? Pierre> -- git alone? Pierre> or stgit, guilt or Quilt? I write my patches willy-nilly, in the craziest style imaginable. This is usually what I push to the public repository as well. For submissions, I make a new private branch and extract bits from the development branch in various ways -- sometimes cherry-picking, sometimes patches -- and use git rebase to make a patch series. For this, the "Perfect Patch Series" instructions in the git manual are ideal, I just follow them exactly. After this, if I need to rework the patches, I just do it on my local branch, this time rebasing, etc, to keep the patches clean. Pierre> How do you handle ChangeLog entries for instance? Pierre> do you really put them into the commits, but then Pierre> they would appear formatted as a diff in the patch also Pierre> or do you have special scripts for this? Usually I ignore them until the point of patch submission, because they are such a pain to deal with. On occasion I have written my ChangeLog entries during the rebase process, then just used them as the commit messages in git. Then if I need to rework the patch series, I also update the commit messages as I go. I don't usually modify my branch ChangeLog files since it is just a pain. It makes random conflicts if I rebase (there are some tools to help with this, but I haven't bothered yet), and on the development branch I often rework things, so just accumulating the ChangeLog entries would yield the wrong result for the upstream submission anyhow. Tom