World: r3wp
[!REBOL3 Source Control] How to manage build process
older newer | first last |
Carl 29-Oct-2010 [386] | So... what's the general flow. For example: 1. developer clones host-kit repo 2. makes changes as needed 3. commits to local repo Then, developer must somehow put them somewhere that we can pull from, correct? |
Andreas 29-Oct-2010 [387] | Yes. |
Carl 29-Oct-2010 [388] | So, there's no "push" is there? |
Andreas 29-Oct-2010 [389] | 4a1. developer exports commits as patches 4a2. developer attaches the patches to a curecode issue |
BrianH 29-Oct-2010 [390] | Do the CRLF-local, LF-repo on Windows; LF local and repo on Linux. Then line endings will be normalized. Only applies to text files of course. |
Andreas 29-Oct-2010 [391x2] | 4b1. developer forks the r3-hostkit repo on github to his github user account 4b1. developer pushes his changes to his github fork |
4b3. developer notifies upstream via r3 chat, altme, curecode, or even github pull requests. | |
Carl 29-Oct-2010 [393x2] | So, there's a git patch command to emit patch file? |
Or does user do that manually? | |
Andreas 29-Oct-2010 [395x2] | git diff emits patches |
git format-patch emits patches that are ready to be emailed | |
Carl 29-Oct-2010 [397] | is the "fork" you mention for 4b1 the same as a clone? |
Andreas 29-Oct-2010 [398] | The specific "forking" I was referring to is a Github feature. |
Carl 29-Oct-2010 [399] | ok |
Andreas 29-Oct-2010 [400x4] | We can quickly try it out, it is really simple. |
But if you have a look at http://github.com/earl/r3-hostkit | |
You will see that at the top there is a link "forked from rebolsource/r3-hostkit". | |
When you look at http://github.com/rebolsource/r3-hostkit/network/members | |
Carl 29-Oct-2010 [404] | Whoops, I'm being called to dinner. Will be back in a while, and will check that out. |
Andreas 29-Oct-2010 [405x2] | You'll see that Github lists all "forks" there. |
Enjoy! | |
Carl 29-Oct-2010 [407] | bye for now |
Andreas 29-Oct-2010 [408] | Brian, the only trouble with letting git do the line ending normalisation is that it is a bit troublesome. It's generally easier to just have git not touch the line endings at all and use a properly set-up editor instead. |
BrianH 29-Oct-2010 [409] | Oh, I was used to Hg just doing that without the problems. Can we reject submissions that don't have the right line endings? |
Andreas 29-Oct-2010 [410] | Yes. |
BrianH 29-Oct-2010 [411] | And I assume every major C/C++ compiler on Windows can handle LF-endings with no complaint. |
Andreas 29-Oct-2010 [412] | We only have to support one that does. |
BrianH 29-Oct-2010 [413] | Is there a pending proposal to fix git's line ending munging so it works properly, like Hg's? |
Andreas 29-Oct-2010 [414] | (-> "Source control") |
Carl 29-Oct-2010 [415] | Useful git guide: www.sourcemage.org/Git_Guide Shows examples of many commands. In FAQ format. |
Andreas 29-Oct-2010 [416x3] | A few examples there are a bit out of date, though. |
For example, git-update-index is no longer needed to resolve merge conflics. You'd use git-add instead. | |
And in the "advanced usage" examples, a few commands have been simplified. | |
Carl 29-Oct-2010 [419x3] | A question: for new releases, should I push to my carls repo, the rebol sandbox, or r3-hostkit ? |
Asked another way: how does r3-hostkit get updated? | |
Do we always pull into it? | |
Andreas 29-Oct-2010 [422x5] | I would push into rebol/r3-hostkit for now. |
(Which does not yet exist.) | |
The rebol/sandbox is just if you want to play around a bit with Github. | |
We'll probably just delete that afterwards. | |
Of course you can also create a repo under your carls user for playing around. | |
Carl 29-Oct-2010 [427] | Another question: do you normally access github from git? Do you ever use the web interface? |
Andreas 29-Oct-2010 [428] | You hardly need to use the web interface. |
Carl 29-Oct-2010 [429x2] | Good to know. |
Is there a command for renaming files? | |
Andreas 29-Oct-2010 [431] | git-mv |
Carl 29-Oct-2010 [432] | If I remove a file from my repo, then I push . does it remove it from the target repo? |
Andreas 29-Oct-2010 [433x2] | If you remove with git-rm, then create a commit with git-commit, then git-push: yes. |
If you remove with something else, you'll still need to create a commit for that remove. | |
Carl 29-Oct-2010 [435] | What is the reason to use git-push vs git push ? |
older newer | first last |