January 24, 2011 [phobos] [dmd-internals] svn-->git migration | ||||
---|---|---|---|---|
| ||||
Posted in reply to Jens Mueller | On Mon, 2011-01-24 at 11:49 +0100, Jens Mueller wrote:
> Walter Bright wrote:
> > Jason Evans wrote:
> > >
> > >The above example has several steps in it that can be skipped for such a simple change, but for more involved changes, this work flow is the foundation. git is a complex tool, but the underlying concepts are coherent, consistent, and straightforward. Learn those concepts well and you will be largely able to infer what git is capable of.
> > >
> > >
> >
> > This is good stuff, thanks!
> >
> > How do we set things so that line endings are automatically normalized to LF?
>
> http://help.github.com/dealing-with-lineendings/
> see
> "I just cloned and git says files have changed!"
>
> Does this help?
So it seems we should all enable the core.autocrlf option and re-checkout our repos then?
-Lars
|
January 24, 2011 [phobos] [dmd-internals] svn-->git migration | ||||
---|---|---|---|---|
| ||||
Posted in reply to Don Clugston | On 01/24/2011 11:19 AM, Don Clugston wrote: >> My general experiences with linux apps ported to Windows is that they suck >> > because: >> > >> > 1. the main devs won't touch windows, so the ports are done by someone else >> > who doesn't really understand the code >> > 2. the app tends to have weird and wacky problems with / and \ in paths >> > 3. running the app requires a boatload of other linux utilities that are >> > also half-assed ports to windows >> > 4. the app has a schizophrenic relationship with LF vs CRLF line endings >> > (git has this problem) >> > 5. the windows port tends to lag by multiple versions >> > 6. the windows port randomly crashes and nobody cares (I'm looking at you, >> > LaTeX) >> > 7. documentation is lacking on the windows port >> > 8. tech support is lacking for it > That's my experience, too. And there often seems to be a denial that the support is so poor. (This is why I had advocated Mercurial over git). From what I read in this thread, Mercurial seems /far/ easier to use. (Why was git chosen?) Denis -- _________________ vita es estrany spir.wikidot.com |
January 24, 2011 [phobos] [dmd-internals] svn-->git migration | ||||
---|---|---|---|---|
| ||||
Posted in reply to Lars Tandle Kyllingstad | Lars Tandle Kyllingstad wrote: > On Mon, 2011-01-24 at 11:49 +0100, Jens Mueller wrote: > > Walter Bright wrote: > > > Jason Evans wrote: > > > > > > > >The above example has several steps in it that can be skipped for such a simple change, but for more involved changes, this work flow is the foundation. git is a complex tool, but the underlying concepts are coherent, consistent, and straightforward. Learn those concepts well and you will be largely able to infer what git is capable of. > > > > > > > > > > > > > > This is good stuff, thanks! > > > > > > How do we set things so that line endings are automatically normalized to LF? > > > > http://help.github.com/dealing-with-lineendings/ > > see > > "I just cloned and git says files have changed!" > > > > Does this help? > > So it seems we should all enable the core.autocrlf option and re-checkout our repos then? I'll guess not. Because core.autocrlf = true means "Use this setting if you want to have CRLF line endings in your working directory even though the repository does not have normalized line endings." (see man git-config) See here for further explanation: http://stackoverflow.com/questions/3206843/how-line-ending-conversions-work-with-git-core-autocrlf-between-different-operati The part "Moving forward" on github seems rather strange to me. Jens |
January 24, 2011 [phobos] svn-->git migration | ||||
---|---|---|---|---|
| ||||
Posted in reply to Jason Evans | On Sun, 2011-01-23 at 13:12 -0800, Jason Evans wrote:
> I converted the druntime repository from svn to git a few days ago, and I'm doing the same for phobos and dmd today. Please hold any pending changes you have until the conversion is complete, then commit your changes to the git repository. See https://github.com/D-Programming-Language for more information about the git repositories.
>
> For right now I'm focusing on getting the conversion done as quickly and smoothly as possible, but after it's done, I'll try to help people with general git configuration and work flow issues as necessary.
>
> Thanks,
> Jason
I've noted that the commits I've made earlier (to the SVN repository) don't seem to get linked to my github account. How, if possible, can I fix this?
-Lars
|
January 24, 2011 [phobos] svn-->git migration | ||||
---|---|---|---|---|
| ||||
Posted in reply to Lars Tandle Kyllingstad | On Mon, 2011-01-24 at 15:00 +0100, Lars Tandle Kyllingstad wrote:
> On Sun, 2011-01-23 at 13:12 -0800, Jason Evans wrote:
> > I converted the druntime repository from svn to git a few days ago, and I'm doing the same for phobos and dmd today. Please hold any pending changes you have until the conversion is complete, then commit your changes to the git repository. See https://github.com/D-Programming-Language for more information about the git repositories.
> >
> > For right now I'm focusing on getting the conversion done as quickly and smoothly as possible, but after it's done, I'll try to help people with general git configuration and work flow issues as necessary.
> >
> > Thanks,
> > Jason
>
> I've noted that the commits I've made earlier (to the SVN repository) don't seem to get linked to my github account. How, if possible, can I fix this?
Nevermind, I figured it out moments after sending that message. :) Just had to add a few more e-mail addresses to my github account.
-Lars
|
January 24, 2011 [phobos] svn-->git migration | ||||
---|---|---|---|---|
| ||||
Posted in reply to Jason Evans | This is an ambitious attempt!
My github ID is "shoo".
I made it just now.
I develop some programs on Windows. And I have used msysGit.
In addition my development environment is Japanese(character set is
Shift_JIS).
Here is the assumed approximately worst environment!
I hope that it is improved even if little by little...
--
SHOO
(2011/01/24 6:12), Jason Evans wrote:
> I converted the druntime repository from svn to git a few days ago, and I'm doing the same for phobos and dmd today. Please hold any pending changes you have until the conversion is complete, then commit your changes to the git repository. See https://github.com/D-Programming-Language for more information about the git repositories.
>
> For right now I'm focusing on getting the conversion done as quickly and smoothly as possible, but after it's done, I'll try to help people with general git configuration and work flow issues as necessary.
>
> Thanks,
> Jason
|
January 25, 2011 [phobos] svn-->git migration | ||||
---|---|---|---|---|
| ||||
Posted in reply to Jason Evans | Awesome!
git has some useful features so I like git :)
I often use rebase, cherry-pick and stash.
In addition, github is cool.
My github account is 'repeatedly'.
Thanks Jason!
Masahiro
On Mon, 24 Jan 2011 06:12:59 +0900, Jason Evans <jasone at canonware.com> wrote:
> I converted the druntime repository from svn to git a few days ago, and I'm doing the same for phobos and dmd today. Please hold any pending changes you have until the conversion is complete, then commit your changes to the git repository. See https://github.com/D-Programming-Language for more information about the git repositories.
>
> For right now I'm focusing on getting the conversion done as quickly and smoothly as possible, but after it's done, I'll try to help people with general git configuration and work flow issues as necessary.
>
> Thanks,
> Jason
> _______________________________________________
> phobos mailing list
> phobos at puremagic.com
> http://lists.puremagic.com/mailman/listinfo/phobos
|
January 24, 2011 [phobos] [dmd-internals] svn-->git migration | ||||
---|---|---|---|---|
| ||||
Posted in reply to Jason Evans | In SVN you can set eol-style to native, and it converts line endings when the repos is retrieved, I believe. Maybe we'll just have to standardize on \n?
On Jan 23, 2011, at 8:42 PM, Jason Evans wrote:
> On 01/23/2011 08:28 PM, Walter Bright wrote:
>> How do we set things so that line endings are automatically normalized to LF?
>
> You mean, something similar to a subversion commit hook script that re-writes the commit on the fly? I don't think we'll be able to do that in general, due to the distributed nature of git. Here is a relevant github support discussion:
>
> http://support.github.com/discussions/feature-requests/686-pre-commit-hooks
>
> The core of the problem is that an entire series of changes (including arbitrarily complex forking/merging) can be performed in a local repository, then pushed to github all at once. Therefore, normalization would have to do some non-trivial history rewriting, which would then cause divergence from the repository the changes were pushed from.
>
> Thanks,
> Jason
> _______________________________________________
> phobos mailing list
> phobos at puremagic.com
> http://lists.puremagic.com/mailman/listinfo/phobos
|
January 24, 2011 [phobos] [dmd-internals] svn-->git migration | ||||
---|---|---|---|---|
| ||||
Posted in reply to spir | On Mon, 2011-01-24 at 14:45 +0100, spir wrote: [ . . . ] > From what I read in this thread, Mercurial seems /far/ easier to use. (Why was > git chosen?) Mercurial is easier to use. On the other hand Git has been chosen, and the change implemented. There is therefore no point in reopening the debate -- at least at this time. For now it's just get on and use Git. -- Russel. ============================================================================= Dr Russel Winder t: +44 20 7585 2200 voip: sip:russel.winder at ekiga.net 41 Buckmaster Road m: +44 7770 465 077 xmpp: russel at russel.org.uk London SW11 1EN, UK w: www.russel.org.uk skype: russel_winder -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part URL: <http://lists.puremagic.com/pipermail/phobos/attachments/20110124/0228ba5c/attachment.pgp> |
January 24, 2011 [phobos] [dmd-internals] svn-->git migration | ||||
---|---|---|---|---|
| ||||
Posted in reply to Don Clugston | On Mon, Jan 24, 2011 at 12:11 AM, Don Clugston <dclugston at googlemail.com> wrote: > On 24 January 2011 04:32, Jason Evans <jasone at canonware.com> >> Clone the repository. >> >> ?$ git clone git at github.com:D-Programming-Language/druntime.git > > Worth noting that on Windows, you *must* be in the git bash shell. If > you try this from the windows command prompt you get: > Initialized empty Git repository in > /cygdrive/c/dmd2dev/src/gitdmd/druntime/.git/ > fatal: exec ssh failed. > fatal: The remote end hung up unexpectedly There shouldn't be any issue with using cmd or powershell. My guess is that an RSA was not generated, or you don't have your public key activated in your profile. I'm not exactly sure how this works with organizations, but this page should help: http://help.github.com/msysgit-key-setup/ |
Copyright © 1999-2021 by the D Language Foundation