World: r3wp
[!REBOL3 Source Control] How to manage build process
older newer | first last |
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 [435x2] | What is the reason to use git-push vs git push ? |
(and other cmds) | |
Andreas 29-Oct-2010 [437x3] | That's just a convetion I use to refer to commands. |
When I say git-push, you actually writ e `git push`. | |
But if you want to know more: man git-push | |
Carl 29-Oct-2010 [440] | Well, I must say... I am impressed so far. There are a lot of "nice touches" |
Andreas 29-Oct-2010 [441x2] | I'm sure you'll be even more impressed when you dig deeper. |
It is so _extremely_ simple at it's core :) | |
Carl 29-Oct-2010 [443x3] | Yes, and I want to make sure that the R3 Git Guide that we'll post shows that this is very simple to do. |
I think many people have gone to use SVN and will resist a bit using something new. | |
Of course, in the worst cases, they can just use the zip/gz file downloads for read access. | |
Andreas 29-Oct-2010 [446x3] | Or they can even use svn for read access :) |
Try it: svn co https://svn.github.com/rebolsource/r3-hostkit.git | |
On the other hand, I've never met anyone who went back after giving a modern DVCS (which means mostly Git and Hg) a serious try. | |
Carl 29-Oct-2010 [449] | So, to mark an official release, like A110, is it only necessary to commit with that message, or do we need to make a tag as well? |
Andreas 29-Oct-2010 [450x3] | I would suggest adding a tag as well. |
A tag is a minimal object in git, just pointing to a commit. | |
They are cheap! :) | |
Carl 29-Oct-2010 [453] | I'm running out of questions. (A good thing.) |
Andreas 29-Oct-2010 [454x2] | Incorporating changes from others will raise some questions. |
But I think we should not get ahead of ourselves. | |
Carl 29-Oct-2010 [456x2] | Yes, we can deal with that as it happens. |
Ok, so here's the rough plan... | |
older newer | first last |