From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/84027 Path: news.gmane.org!not-for-mail From: Daniel Dehennin Newsgroups: gmane.emacs.gnus.general Subject: Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy' Date: Sat, 04 Jan 2014 22:40:14 +0100 Message-ID: <87eh4no281.fsf@hati.baby-gnu.org> References: <87fvpvbj8k.fsf@hati.baby-gnu.org> <878uuyt37n.fsf@hati.baby-gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Trace: ger.gmane.org 1388871629 29632 80.91.229.3 (4 Jan 2014 21:40:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Jan 2014 21:40:29 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M32279@lists.math.uh.edu Sat Jan 04 22:40:35 2014 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1VzYxP-0006Cq-3K for ding-account@gmane.org; Sat, 04 Jan 2014 22:40:35 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1VzYxD-0001rJ-6h; Sat, 04 Jan 2014 15:40:23 -0600 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1VzYxA-0001qz-9d for ding@lists.math.uh.edu; Sat, 04 Jan 2014 15:40:20 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtps (TLSv1:AES128-SHA:128) (Exim 4.76) (envelope-from ) id 1VzYx8-0007Lq-Jh for ding@lists.math.uh.edu; Sat, 04 Jan 2014 15:40:20 -0600 Original-Received: from zion.baby-gnu.net ([82.225.168.180] helo=zion.baby-gnu.org) by quimby.gnus.org with esmtp (Exim 4.80) (envelope-from ) id 1VzYx6-0003qr-Uw for ding@gnus.org; Sat, 04 Jan 2014 22:40:17 +0100 Original-Received: from hati.asgardr.info ([192.168.1.2] helo=hati.baby-gnu.org) by zion.baby-gnu.org with esmtp (Exim 4.82) (envelope-from ) id 1VzYx4-0005sS-RZ for ding@gnus.org; Sat, 04 Jan 2014 22:40:14 +0100 Organisation: Dark Church of Emacs Mail-Followup-To: ding@gnus.org In-Reply-To: (Steinar Bang's message of "Sat, 04 Jan 2014 15:55:42 +0100") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3.50 (gnu/linux) X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:84027 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Steinar Bang writes: [...] > HOWTO for adding these to gnus master: > - Enter your git gnus clone > cd ~/git/gnus > - Add and fetch the baby-gnu gnus repo > git remote add baby-gnu git://git.baby-gnu.net/gnus.git > git fetch --tags baby-gnu > git fetch baby-gnu > - Update the gnus master branch to HEAD > git checkout master > git pull > - Merge in the tag, and stop for inspection (magit is nice for looking > at the merge results after this step, and also for fixing merge > conflicts):=20 > git merge --no-ff --no-commit feature/use-gnus-parameters-in-gnus-gro= up-split-fancy > - After inspection and fix, either `c' to commit from inside magit, or > commit on the command line: > git commit Hello, When I need to make a merge for an occasional patch like this one, I'm doing quite differently, I do not add the remote: =2D I update the branch where the merge will go: git checkout master && git pull =2D If I'm feeling paranoid, I create a dedicated branch to test the merge: git checkout -b i master =2D I just merge the tag with information given in the pull request: git pull git://git.baby-gnu.net/gnus.git tags/feature/use-gnus-paramete= rs-in-gnus-group-split-fancy =2D In case of paranoid: + I edit the merge message to replace =E2=80=9Ci=E2=80=9D by the real bra= nch where I want to merge + I merge the =E2=80=9Ci=E2=80=9D branch in master, If I'm not happy with= the merge, I just trash the branch and ask for a reworked patch =2D In non-paranoid case, if I'm not happy with the merge, I just reset it (by resetting to =E2=80=9Cupstream=E2=80=9D state): git reset --hard @{u} =20=20 Regards. =2D-=20 Daniel Dehennin R=C3=A9cup=C3=A9rer ma clef GPG: gpg --keyserver pgp.mit.edu --recv-keys 0x7A6FE2DF --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iF4EAREKAAYFAlLIf74ACgkQFrLRMcygGkvwjwEAg7pWpcqUAiNAdvKL8UXZ13i5 YIuiZSXlPb5UPsbf8+sA/06Jwu6xq0KGErZrCYsDqeKywbLthej7TLRCKdof5w1r =Hutk -----END PGP SIGNATURE----- --=-=-=--