Developer forums (C::B DEVELOPMENT STRICTLY!) > Development

A Git Repository for Code::Blocks (ONLY trunk)

<< < (5/10) > >>

oBFusCATed:

--- Quote from: daniloz on November 02, 2011, 05:17:24 pm ---Sorry, I couldn't follow you here. You mean from my first commit to the local GIT repo to my last commit?

--- End quote ---
Yes, something like that. As far as I know rebasing means that all your commits are reverted the commits from svn are applied and then your commits are applied again.
So, I guess this are the steps needed. Btw it is possible to convert all commits to patches with a single command.

daniloz:

--- Quote from: oBFusCATed on November 02, 2011, 06:37:11 pm ---So, I guess this are the steps needed. Btw it is possible to convert all commits to patches with a single command.

--- End quote ---
And the command would be? :-)

oBFusCATed:
RTFM, I don't remember...  :P

Jenna:
I just started to use git-svn since some weeks and it works fine for me.

To create a diff on the commandline, you can use:


--- Code: ---git diff-tree -m -p --pretty <commit>
--- End code ---
where <commit> is the id of the commit, you can get it with git log .

There are many other options, look into git help diff-tree .

The diffs are not usable by tortoise svn, but there is a a python-script, that can convert it on https://www.seegrid.csiro.au/wiki/Infosrvices/GeoserverGit

On linux I suggest using gitk or gitg and of course git gui .

zabzonk:
If you want to play with git-svn, but can't face downloading the whole CB history, you can just clone a particular SVN revision, which will give you something you can work on inside a few minutes as opposed to a few hours for the whole shebang. For example:


--- Code: ---git svn clone -r7548 svn://svn.berlios.de/codeblocks/trunk
--- End code ---

creates a local git repository containing the code for SVN revision 7548.

Navigation

[0] Message Index

[#] Next page

[*] Previous page

Go to full version