On 24 May 2013 09:33, Jürgen Schmidt <jogischm...@gmail.com> wrote: > On 5/24/13 9:19 AM, Andre Fischer wrote: > > On 23.05.2013 19:22, Regina Henschel wrote: > >> Hi Jan, > >> > >> Ariel is the expert here. But perhaps some sites help you, which I > >> have bookmarked: > >> https://git.wiki.kernel.org/index.php/GitSvnCrashCourse > >> http://jan-krueger.net/development/git-cheat-sheet-take-two > >> http://utsl.gen.nz/talks/git-svn/intro.html > >> http://trac.parrot.org/parrot/wiki/git-svn-tutorial > >> > >> janI schrieb: > >>> Hi. > >>> > >>> I have now been trying for some time to get git-svn working. > >>> > >>> Can someone help me getting it to work, by giving me the > >>> n-instructions I > >>> need (maybe we should make a wiki page). > >> > >> I think a Wiki page is a good idea. I can add only things, which I > >> have learned as beginner, although that might be helpful for other > >> beginners. But I'm busy in my daily job for the next month. > > > > Please do. I would like to hear more about your experience and that of > > others. I check in code frequently and locally use git instead of svn. > > But up to now I did not find the courage to use git to commit directly > > to the svn repository :-) > > for me it looks more that we use svn for only practical reasons, it is > the main repository system at the ASF. Some other projects have migrated > to git already and use git for their normal work. > > The whole discussion shows that we should think about a migration of our > code repository to git as well. And please note I talk about the code > repo only. I believe that >90% of our developers prefer to work with git > via git-svn. > > I propose that we discuss a potential migration of our code repo to git > after AOO 4.0. >
I am looking at INFRA-5590 to see if it can be speeded up, that would give us the best of 2 worlds. svn with a git-hub allowing developers to choose. I we on the other prefer a pure GIT environment in the mid.-term, I am not sure I succeed in getting us a git-hub temporary. rgds jan I. > > Juergen > > > > > > -Andre > > > >> > >>> > >>> I want to be able to commit locally with my smaller changes, and in svn > >>> everytime I have something that works. git-svn should be able to do > >>> that. > >>> But it seems it does not like: > >>> - merge from trunk (which I of course need from time to time) > >>> - seeing trunk and branch/l10n as 2 different branches on my disk > >>> > >>> I am obviously doing something wrong, so please let me hear how are you > >>> getting it to work ? > >>> > >>> Currently I have trunk and branches/l10n on my disk as one big "svn > >>> co" on > >>> ubuntu 12.04 > >>> > >>> Thanks in advance for your help. > >> > >> I'm not sure, but have a look at git stash --help. It might fit for > >> your problems. > >> Or the workflow described here: > >> > http://stackoverflow.com/questions/4371044/will-this-git-svn-workflow-work > >> > >> > >> Kind regards > >> Regina > >> > >> --------------------------------------------------------------------- > >> To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org > >> For additional commands, e-mail: dev-h...@openoffice.apache.org > >> > > > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org > > For additional commands, e-mail: dev-h...@openoffice.apache.org > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@openoffice.apache.org > For additional commands, e-mail: dev-h...@openoffice.apache.org > >
