From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: Kamil Dudka <kdudka@redhat.com>
Cc: Bart Schaefer <schaefer@brasslantern.com>, zsh-workers@zsh.org
Subject: Re: ChangeLog (was Re: bug with named pipes and process substitution)
Date: Thu, 23 Jul 2015 22:01:58 +0000 [thread overview]
Message-ID: <20150723220158.GH1847@tarsus.local2> (raw)
In-Reply-To: <8670404.a7CRMdDY00@kdudka.brq.redhat.com>
Kamil Dudka wrote on Thu, Jul 23, 2015 at 10:15:40 +0200:
> On Wednesday 22 July 2015 18:46:18 Bart Schaefer wrote:
> > On Jul 23, 3:03am, Mikael Magnusson wrote:
> > }
> > } > "git stash"-ing all my changes to re-apply after sourceforge is back.
> > }
> > } Why would you do that rather than just committing them?
> >
> > Because (a) I spent the last six days thinking "gee, they've got to be
> > back on line any minute now" and (b) I prefer to "git pull" and then
> > edit the ChangeLog to reduce the chances of a conflict on ChangeLog,
> > because (c) even with --rebase I find the way git handles overlapping
> > diffs in a file that grows at the top to be really annoying and (d) I
> > want the ChangeLog entry to be the same commit as the rest of the diff.
>
> Do the ChangeLog entries actually capture anything that commit messages
> can not? Would not it be better to just generate ChangeLog from git log?
>
> Unlike ChangeLog as a text file, a conflict on commit messages can never
> happen.
>
That's what I do: locally I have just the log messages, and I generate
the ChangeLog from them prior to pushing. (I just reuse the first
sentence verbatim, but any transformation could be substituted.)
An alternative is to use a custom merge tool that automatically resolves
conflicts on ChangeLog, and defers to the default merge tool for
conflicts on other files. I think http://svn.apache.org/r1491816 is
exactly the sort of functionality that would be useful for the ChangeLog
file: it just concatenates the "<<<<<<" and ">>>>>>" sides of the
conflict.
(I don't know if git has equivalent functionality built-in, however,
I do know that mergetools are configurable so I think custom mergetool
could implement equivalent functionality.)
> Kamil
next prev parent reply other threads:[~2015-07-23 22:02 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-22 0:25 bug with named pipes and process substitution Petros Aggelatos
2015-07-22 9:09 ` Peter Stephenson
2015-07-22 9:58 ` Peter Stephenson
2015-07-22 10:27 ` Peter Stephenson
2015-07-22 14:45 ` Bart Schaefer
2015-07-23 1:03 ` Mikael Magnusson
2015-07-23 1:46 ` Bart Schaefer
2015-07-23 8:15 ` ChangeLog (was Re: bug with named pipes and process substitution) Kamil Dudka
2015-07-23 22:01 ` Daniel Shahaf [this message]
2015-07-23 0:32 ` bug with named pipes and process substitution Petros Aggelatos
2015-07-23 9:01 ` Peter Stephenson
2015-07-27 12:25 ` Jun T.
2015-08-08 11:59 ` m0viefreak
2015-08-08 15:21 ` Jun T.
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=20150723220158.GH1847@tarsus.local2 \
--to=d.s@daniel.shahaf.name \
--cc=kdudka@redhat.com \
--cc=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.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.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
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).