[Top][All Lists]

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

Re: Staging/Master Merge - James' Patchy

From: Phil Holmes
Subject: Re: Staging/Master Merge - James' Patchy
Date: Sun, 8 Apr 2012 19:06:50 +0100

----- Original Message ----- From: "Graham Percival" <address@hidden>
To: "Phil Holmes" <address@hidden>
Cc: "James" <address@hidden>; <address@hidden>
Sent: Sunday, April 08, 2012 6:54 PM
Subject: Re: Staging/Master Merge - James' Patchy

On Sun, Apr 08, 2012 at 06:26:30PM +0100, Phil Holmes wrote:
OK.  I know why the patch is broken - it doesn't contain the new
snippets (like  This appears to have been a
mistake when I was creating the huge patch - I had six patches to
apply to get the new one, and I assume I either missed one, or the
files weren't added because I didn't run git add after git apply.
Anyway, I assume this one should be reverted, which I would do if I
knew how.  Could someone either revert it, or tell me how and I'll
push a new one with the missing files.

I'll revert it, but could we avoid having it all smooshed into a
single patch?  When I said that it could be pushed directly, I was
expecting one patch that dealt with the automatic makelsr run.
Not the manual changes to documentation, removing files from
Documentation/snippets/new/, and the like.

There's no reason to do everything at once.  One single
should be a single self-contained patch; the other changes can
happen after that single patch has been accepted to master.

- Graham

I did it as a single patch because it really makes sense like that. There's a lot of changes going on here. 63 deletions from new. Updates to loads of files in snippets. I've updated the docs to take account of the deletions in new. Additions to snippets which will now run.

If I could have worked out how to split them, while at the same time being able to keep track of what changes were still needed, I would have done. However, doing things like having a in new, with a in snippets, and remembering to keep checking that the docs were all up to date and the one in new could be deleted was too much for my brain. The problem was that I believe I needed to get them into a single patch for the benefit of patchy, but I had them in six patches on my system. I git apply-ed each patch, but didn't remember to git add the files.

TBH that seems a duff aspect of git. Any other changes to the repo it can deal with. Add a file and you need to remember to git add it.

I've now got an even more humungous patch which includes the added files. My preference would be to push to staging, patchy and revert if there's a problem.

What's the syntax for a revert?

Phil Holmes

reply via email to

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