p4raw-id issue

Folks,

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
message.

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
results, eg

Porting/git-find-p4-change 34950

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.

Any opinions?

-- 
Gravity is just a theory; teach Intelligent Falling in our schools!
    http://www.theonion.com/content/node/39512

• p4raw-id issue by Dave Mitchell
• Re: p4raw-id issue by demerphq
• Re: p4raw-id issue by Nicholas Clark
• Re: p4raw-id issue by Dave Mitchell
• Re: p4raw-id issue by Dave Mitchell