Gnus development mailing list
 help / color / mirror / Atom feed
From: Steinar Bang <sb@dod.no>
To: ding@gnus.org
Subject: Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'
Date: Sat, 04 Jan 2014 15:55:42 +0100	[thread overview]
Message-ID: <upzcvbxziyoh.fsf@dod.no> (raw)
In-Reply-To: <878uuyt37n.fsf@hati.baby-gnu.org>

>>>>> Daniel Dehennin <daniel.dehennin@baby-gnu.org>:

> 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)




  reply	other threads:[~2014-01-04 14:55 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-14 14:27 Daniel Dehennin
2013-12-28  1:17 ` Daniel Dehennin
2014-01-02 22:43 ` Daniel Dehennin
2014-01-04 14:55   ` Steinar Bang [this message]
2014-01-04 21:40     ` Daniel Dehennin
2014-01-05  5:13       ` Steinar Bang
2014-01-05  5:33         ` Daniel Dehennin
2014-01-05 13:03           ` Steinar Bang
2014-02-01  0:40   ` Lars Ingebrigtsen
2014-02-01 13:04     ` Daniel Dehennin
2014-02-01 20:39       ` Lars Ingebrigtsen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=upzcvbxziyoh.fsf@dod.no \
    --to=sb@dod.no \
    --cc=ding@gnus.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).