Changes between Version 1 and Version 2 of Doc/SCDB/Git


Ignore:
Timestamp:
Jan 19, 2010, 11:21:02 AM (16 years ago)
Author:
/O=GRID-FR/C=FR/O=CNRS/OU=LAL/CN=Michel Jouvin
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Doc/SCDB/Git

    v1 v2  
    7979For interaction with SVN, the following table gives the `git svn` subcommand matching the usual `svn` commands for interaction with the SVN repository (interaction with the Git repository is done with standard `git` commands). If you look for some tutorials on how to use Git with SVN, there are plenty of them around the Internet. Here is a good [http://trac.parrot.org/parrot/wiki/git-svn-tutorial starting point], giving references to more detailed pages.
    8080
    81 || =SVN= || =Git= ||
     81||= SVN =||= Git =||
    8282|| svn checkout || git svn clone ||
    8383|| svn update || git svn rebase ||
    … …  
    9292The current version of the plugin, v0.6, only implements basic Git operations, such as commit, branch, fetch, pull. It doesn't support yet advanced features like merge and it doesn't implement `git svn` command set. That means that if you want to use Eclipse for your edits with Git as the backing repository, you need also to install the standard [http://git-scm.com Git] distribution: you will use standard (command line) Git commands for operation not supported by [http://www.eclipse.org/egit/ Egit]. There is no problem in managing the same Git repository with both [http://www.eclipse.org/egit/ Egit] and [http://git-scm.com Git].
    9393
     94''Note: Git for Windows provides a basic shell to use Git commands with some usual shell commands.''
     95
    9496In v0.6, [http://www.eclipse.org/egit/ Egit] has a problem with symlinks tracked in the Git repository. It tends to change their type to a plain file at each commit, if you don't take care of removing this change from the commit. To avoid potential problems, the work around is to add a `.gitignore` file in directories containing such symlinks. In the standard SCDB distribution, there is one such symlink: `src/utils`. Thus you are advised to add (and commit back to SVN) a file `src/.gitignore` containing the following lines:
    9597{{{