[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

git-merge-changelog question

From: Eric Blake
Subject: git-merge-changelog question
Date: Tue, 30 Jun 2009 06:55:56 -0600
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv: Gecko/20090605 Thunderbird/ Mnenhy/

Hash: SHA1

I've repeatedly encountered a situation where git-merge-changelog is a
hindrance rather than a help.  Any time I commit a patch on one branch,
then want to run 'git cherry-pick' to copy it to another,
git-merge-changelog either segfaults or goes into a super-long processing
loop trying to resolve all of the differences between the two changelog
entries, rather than doing what I wanted of just cherry-picking the most
recent changelog entry and ignoring all other differences in the two
divergent histories.  On projects like gnulib, where all development is in
a single branch, this isn't much of an issue, but on projects like m4,
bison, or automake, where multiple branches are actively maintained and
commits are routinely copied from one branch to another, it gets quite
annoying to have to edit my .git/info/attributes to disable the
git-merge-changelog attribute, perform the cherry-pick, then re-enable the
attribute.  It would be nicer if git-merge-changelog could be taught how
to recognize cherry-picks and treat them correctly.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org


reply via email to

[Prev in Thread] Current Thread [Next in Thread]