From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/84025 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.gnus.general Subject: Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy' Date: Sat, 04 Jan 2014 15:55:42 +0100 Organization: Probably a good idea Message-ID: 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: text/plain X-Trace: ger.gmane.org 1388847406 14407 80.91.229.3 (4 Jan 2014 14:56:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Jan 2014 14:56:46 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M32277@lists.math.uh.edu Sat Jan 04 15:56:52 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 1VzSeh-0005Fm-Pg for ding-account@gmane.org; Sat, 04 Jan 2014 15:56:52 +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 1VzSdf-0000AL-Ur; Sat, 04 Jan 2014 08:55:48 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1VzSdd-0000A7-WE for ding@lists.math.uh.edu; Sat, 04 Jan 2014 08:55:46 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtps (TLSv1:AES128-SHA:128) (Exim 4.76) (envelope-from ) id 1VzSdZ-0005xM-Gv for ding@lists.math.uh.edu; Sat, 04 Jan 2014 08:55:45 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.80) (envelope-from ) id 1VzSdX-0003K2-JK for ding@gnus.org; Sat, 04 Jan 2014 15:55:39 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1VzSdU-00036s-FE for ding@gnus.org; Sat, 04 Jan 2014 15:55:36 +0100 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 04 Jan 2014 15:55:36 +0100 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 04 Jan 2014 15:55:36 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-Lines: 44 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3 (windows-nt) Cancel-Lock: sha1:HrO8L6rz+9LErY7eH+yI9LNPowM= X-Spam-Score: -2.3 (--) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:84025 Archived-At: >>>>> Daniel Dehennin : > The following changes since commit b4bc300f0dcddc2b17bb50a3501ed6e6db1ef12c: > Update copyright year to 2014 (2014-01-01 10:39:44 +0000) > are available in the git repository at: > git://git.baby-gnu.net/gnus.git tags/feature/use-gnus-parameters-in-gnus-group-split-fancy 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): git merge --no-ff --no-commit feature/use-gnus-parameters-in-gnus-group-split-fancy - After inspection and fix, either `c' to commit from inside magit, or commit on the command line: git commit The difference to doing this as opposed to applying the patch, is that you could potentially get the full history of the change with multiple commits (in this case this was just a single commit). If one decide to revert the commit, just do a: git checkout master git reset --hard origin/master (the extra checkout is to be doubly sure I am on the right branch before doing the hard reset) (For those that hasn't used git yet: the reason this works is git's storage-by-content approach, that means that a commit with the same changes and the same metadata is seen as the same commit no matter where it comes from. Ie. a merge with the master on baby-gnu into master from gnus.org will only see a difference for commits that have been added on baby-gnu)