Re: Can't get a patch through because of weekly development releases.

[Carl Sorensen]

On 7/15/10 8:41 AM, "Graham Percival" <address@hidden> wrote:

> On Thu, Jul 15, 2010 at 02:45:41PM +0200, David Kastrup wrote:
>> Graham Percival <address@hidden> writes:
 
> For the record, I'd call the shell script 15 minutes (Carl already
> posted the commands, but I suspect it can be done in a "cleaner"
> manner with rebase or git commit --amend or something like that),
> and the build system modifying 5 hours.  And I don't imagine that
> we'll have many new features with these convert-ly problems.

Actually, this set of commands doesn't work if your patch adds files,
because git reset --hard HEAD won't delete the added files.

I think that David's idea has some promise now.  Create a new branch, with a
version that's unique to this branch.  Do all the changes in files to the
new version.  Get the patch reviewed (and get the reviewers to ignore the
custom version).

When the patch is reviewed, and everything is ready to push, do some sort of
git grep for the custom version, and pipe it to xargs, and use sed on the
resulting files to change from custom version to current version.  Then git
apply and it's good to go.

The key issue here is having a custom version that won't appear anywhere
except in my patched files.

I'll give this a go a bit later.

Thanks,

Carl