From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/74152 Path: news.gmane.org!not-for-mail From: Daniel Dehennin Newsgroups: gmane.emacs.gnus.general Subject: Re: mml2015-epg-sign do not use from header Date: Thu, 18 Nov 2010 00:08:09 +0100 Message-ID: <87mxp7wnty.fsf@hati.baby-gnu.org> References: <87k58jqh6u.fsf@hati.baby-gnu.org> <87pqu6uqr7.fsf@hati.baby-gnu.org> <8762vxuifo.fsf@hati.baby-gnu.org> <87zkt9t2ul.fsf@hati.baby-gnu.org> <874obfyj5c.fsf@hati.baby-gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Trace: dough.gmane.org 1290035322 18306 80.91.229.12 (17 Nov 2010 23:08:42 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 17 Nov 2010 23:08:42 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M22517@lists.math.uh.edu Thu Nov 18 00:08:38 2010 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PIr7G-0006t4-2s for ding-account@gmane.org; Thu, 18 Nov 2010 00:08:38 +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 1PIr6x-0001YP-AA; Wed, 17 Nov 2010 17:08:19 -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 1PIr6u-0001YB-Hy for ding@lists.math.uh.edu; Wed, 17 Nov 2010 17:08:16 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtp (Exim 4.72) (envelope-from ) id 1PIr6p-0003VY-KX for ding@lists.math.uh.edu; Wed, 17 Nov 2010 17:08:15 -0600 Original-Received: from zion.baby-gnu.org ([82.233.222.74]) by quimby.gnus.org with esmtp (Exim 3.36 #1 (Debian)) id 1PIr6o-0005Q3-00 for ; Thu, 18 Nov 2010 00:08:10 +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.72) (envelope-from ) id 1PIr6n-0008M4-HD for ding@gnus.org; Thu, 18 Nov 2010 00:08:09 +0100 Organisation: Dark Church of Emacs In-Reply-To: (Lars Magne Ingebrigtsen's message of "Wed, 17 Nov 2010 18:13:47 +0100") User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/24.0.50 (gnu/linux) X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:74152 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Lars Magne Ingebrigtsen writes: > Daniel Dehennin writes: > >> Footnotes:=20 >> [1] git pull http://www.baby-gnu.org/~nebu/archives/gnus/gnus.git dad/mm= l2015-e > > Pulled and pushed. > > But I'm still not understanding how this git thing is supposed to work. > Many times I pull something, I get a conflict in ChangeLog. So I have > to fix that, and then say "git commit -a", and then I can push. This may have things to do with fast-forward? Personally, I always develop on a specific branch, and rebase this local branch on upstream master to resolve such conflits locally, but you can commit thing before pulling and then have troubles. It seems there is the possibility to have a special changelog merge driver[1]. Maybe another way is to have a specific workflow to only have fast-forward merge? > This seems really weird. But, then again, the ChangeLog thing is really > weird, too. For people who need it (like package maintainer), there is the possibility to generate them when needed[2] with the well suited pretty format. Regards. Footnotes:=20 [1] like in http://raphaelhertzog.com/2009/10/08/3-way-merge-of-debian-cha= ngelog-files/ [2] git log lisp >| lisp/ChangeLog =2D-=20 Daniel Dehennin R=C3=A9cup=C3=A9rer ma clef GPG: gpg --keyserver pgp.mit.edu --recv-keys 0x6A2540D1 --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) iEYEAREKAAYFAkzkYFkACgkQb97L6l6P4FtGRgCdHmYHve+3otGzo50wF6O6lDhD oyMAniWK+/pjsBu4RQSJAsofD0OxCSw1 =dUks -----END PGP SIGNATURE----- --=-=-=--