Front page | perl.perl5.porters |
Postings from February 2009
From: Dave Mitchell
February 14, 2009 06:31
Message ID: 20090214143115.GB6111@iabyn.com
I've just discovered an issue with cherry-picking patches into maint that
have the 'p4raw-id: //depot/perl@34790' text as part of the commit
By default that text becomes part of the maint commit message too.
This means that tools like Porting/git-find-p4-change now show up spurious
displays the 5.10.x commit, not the original bleed one.
My thoughts on fixing this are:
1. modify git-find-p4-change in some way to handle this; e.g. change the
search order so that it searches bleed before maint, or make it ignore
commits whose description includes the 'cherry picked from' text. But I
can't see how to do either of these.
2. Rewrite the maint commit history to change p4raw-id in each commit
message to something else, e.g. 'p4raw-merged-from: 12345', or perhaps
just lose the text altogether. However that involves rewriting history in
a public repository, which I presume could make life hard for people. I
suppose it depends how many people have checked out 5.10.x.
Gravity is just a theory; teach Intelligent Falling in our schools!
by Dave Mitchell