On Thu, 4 Aug 2016, Swift Griggs wrote:
> On Thu, 4 Aug 2016, Jon Trulson wrote:
>> I am guessing that they were not... I apply patches sent to the devel
>> mailing list in git format-patch format. If they were never delivered
>> to the ML, then they were never applied.
>
> Gotcha. I'd be happy to mail in the patches. I just want to double check
> I'm putting them in the correct format. I'm familiar with git, but my
> chops are in CVS. I found some web tutorials on that, so I'll give it a
> shot.
>
>> If you would like to test/submit them to the ML in the appropriate
>> format, I'd be more than happy to incorporate them.
>
> Can you confirm that I'm on the right track? I don't see a way to use
> straightforward 'diff'-style syntax with git. It appears I've got to clone
> the repo (already done), create a branch, do my edits, then use:
>
> git format-patch master --stdout > my_patch.patch
>
I usually do something like:
clone the repo
create a new branch
apply the original diff in whatever way works
make any changes you think are needed
add/commit the changes to your branch, with appropriate commit message
Then,
git format-patch -1
This will create a file called 0001-something...
Then send that file as an attachment to the ML, and I can easily add
it with 'git am 0001-.....' This will preserve your authorship and
commit message. Works great once you get the hang of it.
Instead of '-1', you can do a -<N> and it will create a separate file
for each of the last <N> commits.
> Does that look right? If so, I'll get started right away. BTW, do you have
> any preferences around #define(__MYOS_) wrappering? Let me know if you do
> and I'll follow your lead.
>
Well, you should see many already in use... Use whichever seems
appropriate (and is already being used of course). Don't invent any
new ones :)
--
Jon Trulson
"If we can hit that bull's-eye, the rest of the dominoes will fall
like a house of cards... Checkmate."
-- Zapp Brannigan
------------------------------------------------------------------------------
_______________________________________________
cdesktopenv-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
