Developer forums (C::B DEVELOPMENT STRICTLY!) > CodeCompletion redesign
CC plugin interface redesign
oBFusCATed:
Read this topic: http://forums.codeblocks.org/index.php/topic,16096.45.html somewhere in it you can find how to add your svn info to the repo. I'm not sure you need to rewrite your history in order to make git svn dcommit work.
Alpha:
--- Quote from: oBFusCATed on February 07, 2014, 01:18:30 am ---0. add and push a tag for the current pointer of your branch. This will help if someone has commits on top of your branch.
1. pull the master from my repo
2. checkout your branch
3. git rebase master (or the remote/blabla/master)
4. fix all conflicts
--- End quote ---
I have done up to this step, however, now my local branch has a few pieces of code that are different than before (and I am fairly certain I had correctly resolved all conflicts). Is it okay to commit a fix/revert of these (incorrect) changes on top of the rebase?
oBFusCATed:
Yes, it is. If you don't this dummy commit you can squash it back again in the commit that has introduced the changes you don't like. This way your history will be clean. :)
Alpha:
Done resolving conflicts, and committed to my git branch.
The problem of setting up git svn, though, I am unsure how to solve. Trying to use a git svn command resulted in:
--- Code: ---Migrating from a git-svn v1 layout...
Data from a previous version of git-svn exists, but
.git/svn
(required for this version (1.8.3.2) of git-svn) does not exist.
Done migrating from a git-svn v1 layout
--- End code ---
and then indefinite hang. From my understanding of reading http://forums.codeblocks.org/index.php/topic,16096.45.html (and searching the web), the expected process of using git svn is starting from an svn repository. Because I started originally from standard git, I have not been able to figure out how to hook into the svn repository. Suggestions?
ollydbg:
--- Quote from: Alpha on February 14, 2014, 01:39:16 am ---Done resolving conflicts, and committed to my git branch.
The problem of setting up git svn, though, I am unsure how to solve. Trying to use a git svn command resulted in:
--- Code: ---Migrating from a git-svn v1 layout...
Data from a previous version of git-svn exists, but
.git/svn
(required for this version (1.8.3.2) of git-svn) does not exist.
Done migrating from a git-svn v1 layout
--- End code ---
and then indefinite hang. From my understanding of reading http://forums.codeblocks.org/index.php/topic,16096.45.html (and searching the web), the expected process of using git svn is starting from an svn repository. Because I started originally from standard git, I have not been able to figure out how to hook into the svn repository. Suggestions?
--- End quote ---
Hi, alpha, I just clone your git https://github.com/alpha0010/codeblocks_sf/tree/cc_interface
I see that all the change is based on the latest C::B svn/git head, great!
I guess that the git you use does not contains any svn information to allow you to do git svn dcommit, so this is what I suggest:
1, simply clone a new git repo(we call it local-git-new-repo) from official C::B SVN, note you should use C::B SVN address you have write access. Since a git svn clone of the whole C::B svn history takes long time, you can have either two ways
a, you can clone a C::B svn starting from a specified svn revision, for example, from rev 9640, so in your local git, you can only have a history about 10 commits. That should be a very fast clone, because git svn command only fetch nearly 10 commits. The important thing is with this git clone, you can use git svn dcommit to commit to C::B svn repo.
b, you can copy a raw git achieve from other one, e.g. jens supply one, see this page Re: Read-only Git, SVN Repo for Code::Blocks, when downloaded, you need to some further steps to change the svn information, so that you have a git repo which can commit back to svn, also you have a full svn history.
2, you can use the git format-patch command to generate a serial patches from your https://github.com/alpha0010/codeblocks_sf/tree/cc_interface (we call it local-git-old-repo).
3, you can use git am command to apply the patches to local-git-new-repo.
4, use local-git-new-repo to commit(git svn dcommit) back the changes to C::B official svn repo.
Now, you can see all the changes in local-git-old-repo is now in local-git-new-repo, and further in C::B svn repo.
BTW: you can also arrange your changes by "git rebase -i" (interactive git rebase), you can divide commits, merge commits, edit commit log messages, drop commits, all what you know. :)
EDIT: look at your previous message, I guess some git svn tool is missing? I don't know, because under Windows, I have no problems using msysgit + tortoisegit, many operations can be mouse click on tortoiisegit, but some special command like "git rebase -i" should be run in msysgit's bash shell to get more functionality due to tortoisegit limitation.
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version