From: Sven Joachim <svenjoac@gmx.de>
To: ding@gnus.org
Subject: Merging ChangeLogs (was: mml2015-epg-sign do not use from header)
Date: Wed, 17 Nov 2010 18:37:50 +0100 [thread overview]
Message-ID: <8739qzq2a9.fsf_-_@turtle.gmx.de> (raw)
In-Reply-To: <m3ipzvq3ec.fsf@quimbies.gnus.org> (Lars Magne Ingebrigtsen's message of "Wed, 17 Nov 2010 18:13:47 +0100")
On 2010-11-17 18:13 +0100, Lars Magne Ingebrigtsen wrote:
> 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.
The gnulib project has a special merge driver for ChangeLogs¹ that could
significantly improve this workflow. I haven't tested it myself yet,
though.
> This seems really weird. But, then again, the ChangeLog thing is really
> weird, too.
There's a reason why most projects have given up on writing ChangeLogs.
Cheers,
Sven
¹ http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob;f=lib/git-merge-changelog.c;h=652b40a72d1cc87bf417484f7109632d2ae55f6e;hb=cc98e1ec101be0b8d260025b5e40bfec7f4b1ac5
next prev parent reply other threads:[~2010-11-17 17:37 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-25 20:11 mml2015-epg-sign do not use from header Daniel Dehennin
2009-01-25 20:37 ` Reiner Steib
2009-01-25 20:43 ` Daniel Dehennin
2009-01-26 1:34 ` Daiki Ueno
2009-02-28 11:25 ` Reiner Steib
2009-03-01 3:27 ` Daiki Ueno
2009-01-28 11:57 ` Daniel Dehennin
2009-01-28 11:59 ` [PATCH] mml2015-epg-sign does " Daniel Dehennin
2009-03-01 17:13 ` Daiki Ueno
2009-03-03 18:59 ` Daniel Dehennin
2009-04-13 20:31 ` Daniel Dehennin
2009-04-13 20:32 ` [PATCH] mml2015-epg-encrypt do not use from header to sign Daniel Dehennin
2009-01-28 12:00 ` [PATCH] Factor spliting mail addresses Daniel Dehennin
2009-04-13 20:32 ` Daniel Dehennin
2009-01-28 12:01 ` [PATCH] Cleanup selecting a key for sign and encryption Daniel Dehennin
2009-04-13 20:32 ` Daniel Dehennin
2009-01-28 12:02 ` [PATCH] Only one sender Daniel Dehennin
2009-04-13 20:32 ` Daniel Dehennin
2009-01-28 12:02 ` Daniel Dehennin
2009-04-13 20:32 ` Daniel Dehennin
2009-01-28 12:02 ` [PATCH] Factorize choosing a key Daniel Dehennin
2009-04-13 20:33 ` Daniel Dehennin
2009-01-28 12:02 ` [PATCH] mml2015-epg-choose-keys handle the verbose selection of keys Daniel Dehennin
2009-04-13 20:33 ` Daniel Dehennin
2009-01-28 12:02 ` [PATCH] Fix variable name, only one sender Daniel Dehennin
2009-01-28 12:02 ` [PATCH] Remove useless variables Daniel Dehennin
2009-04-13 20:33 ` Daniel Dehennin
2009-01-28 12:03 ` [PATCH] Permit to select a key if more than one match a mail address Daniel Dehennin
2009-04-13 20:33 ` Daniel Dehennin
2009-04-13 20:31 ` mml2015-epg-sign do not use from header Daniel Dehennin
2009-04-13 22:48 ` Daiki Ueno
2010-11-15 23:11 ` Daniel Dehennin
2010-11-15 23:13 ` mml2015-epg-sign does not use From header Daniel Dehennin
2010-11-15 23:23 ` Daniel Dehennin
2010-11-16 18:21 ` mml2015-epg-sign do not use from header Lars Magne Ingebrigtsen
2010-11-16 20:23 ` Daniel Dehennin
2010-11-16 20:27 ` Lars Magne Ingebrigtsen
2010-11-16 20:45 ` Daniel Dehennin
2010-11-17 7:34 ` Katsumi Yamaoka
2010-11-17 17:06 ` Daniel Dehennin
2010-11-17 17:13 ` Lars Magne Ingebrigtsen
2010-11-17 17:37 ` Sven Joachim [this message]
2010-11-21 4:51 ` Merging ChangeLogs Lars Magne Ingebrigtsen
2010-11-21 7:38 ` Sven Joachim
2010-11-21 7:43 ` Lars Magne Ingebrigtsen
2010-11-21 8:12 ` Sven Joachim
2010-11-21 8:19 ` Sven Joachim
2010-11-22 19:42 ` Ted Zlatanov
2010-11-24 21:13 ` Lars Magne Ingebrigtsen
2010-11-17 18:07 ` mml2015-epg-sign do not use from header Julien Danjou
2010-11-21 4:49 ` Lars Magne Ingebrigtsen
2010-11-17 23:08 ` Daniel Dehennin
2010-11-21 4:47 ` Lars Magne 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=8739qzq2a9.fsf_-_@turtle.gmx.de \
--to=svenjoac@gmx.de \
--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).