Developer forums (C::B DEVELOPMENT STRICTLY!) > Development
Move some GUI code from sdk to src
oBFusCATed:
Here you can find the current status of the work.
https://github.com/obfuscated/codeblocks_sf/tree/no_ui_sdk
If anyone is interested in helping patches are welcome.
BTW: this is a git clone of the sf repo, I'll try keep it synced...
https://github.com/obfuscated/codeblocks_sf/
MortenMacFly:
--- Quote from: oBFusCATed on May 11, 2013, 05:31:37 pm ---Here you can find the current status of the work.
https://github.com/obfuscated/codeblocks_sf/tree/no_ui_sdk
--- End quote ---
Well nice, but why didn't you just start a SVN branch so that we can merge and keep your changes tracked in our repo?
Its useless if you want to commit all this in one go at the end. You are the person that always reminds about atomic commits you know... What are your plans with these changes? Flush them in the end? ::)
oBFusCATed:
--- Quote from: MortenMacFly on May 12, 2013, 10:02:46 am ---Well nice, but why didn't you just start a SVN branch so that we can merge and keep your changes tracked in our repo?
--- End quote ---
1. I'm not using svn any more. All my svn checkouts are put inside git repos.
2. With this one I'm testing git <-> svn syncing.
3. With git branches you have a single repo checkout on disk, which saves a lot of space
--- Quote from: MortenMacFly on May 12, 2013, 10:02:46 am ---Its useless if you want to commit all this in one go at the end. You are the person that always reminds about atomic commits you know... What are your plans with these changes? Flush them in the end? ::)
--- End quote ---
git rebase master will put them at the top
git svn dcommit will commit them as single commits.
MortenMacFly:
--- Quote from: oBFusCATed on May 12, 2013, 11:02:49 am ---git rebase master will put them at the top
git svn dcommit will commit them as single commits.
--- End quote ---
My Git-Foo is not that powerful. Does that mean we will get all your commits as single commits in the end merged into trunk? How does that work? As trunk moves on I see no possibility to "replay" all SVN commits w/o serious hassle.
The only feasible option I see is still a SVN branch in the background where you push from time to time so that we keep the changes in SVN and can do a proper merge once gone gold. Its OK if you use GIT - no problem, but we should be able to follow all steps later on in SVN. Just as you did with tiny commits in the past. I juts don't see how this is supposed to work if you massively touch the core w/o a SVN branch as a backend. Maybe you can enlighten me on that...
But if its really going to be one large commit (to use your words:) "I am going to revert it immediately". ;-)
oBFusCATed:
--- Quote from: MortenMacFly on May 12, 2013, 02:24:19 pm ---My Git-Foo is not that powerful. Does that mean we will get all your commits as single commits in the end merged into trunk? How does that work? As trunk moves on I see no possibility to "replay" all SVN commits w/o serious hassle.
--- End quote ---
The thing is that git rebase is pretty powerful. It is the same as if you manually apply all the patches, but it is a bit smarter.
So in the end, when I/we are done with this feature, all git commits will be converted to svn commits.
And svn users will see them as a string of commits with very close times.
This is it.
git makes managing patches an easy task.... using svn diff + patch is so old school and PITA.
--- Quote from: MortenMacFly on May 12, 2013, 02:24:19 pm ---The only feasible option I see is still a SVN branch in the background where you push from time to time so that we keep the changes in SVN and can do a proper merge once gone gold. Its OK if you use GIT - no problem, but we should be able to follow all steps later on in SVN. Just as you did with tiny commits in the past. I juts don't see how this is supposed to work if you massively touch the core w/o a SVN branch as a backend. Maybe you can enlighten me on that...
--- End quote ---
Wait and see :)
Only I have to find time to work on this feature.
--- Quote from: MortenMacFly on May 12, 2013, 02:24:19 pm ---But if its really going to be one large commit (to use your words:) "I am going to revert it immediately". ;-)
--- End quote ---
In fact if you like it could be made as a single commit (I suppose).
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version