james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ioan Eugen Stan <stan.ieu...@gmail.com>
Subject Re: How to use git-svn with James
Date Sat, 16 Jun 2012 17:31:23 GMT
2012/6/16 Eric Charles <eric@apache.org>:
> If you want to show us something, a good old svn branch will also do the job
> :)
> Eric
>

I'm just exercising git and testing the git-svn integration.

>
> On 06/16/2012 04:34 PM, Ioan Eugen Stan wrote:
>>
>> Hi Gazda,
>>
>> There is a good tutorial on this subject on:
>> http://wiki.apache.org/general/GitAtApache .
>>
>> I've used it to work on
>> https://github.com/ieugen/james-mime4j/tree/master.
>>
>> 2012/6/15 Ioan Eugen Stan<stan.ieugen@gmail.com>:
>>>
>>> Hi Gazda,
>>>
>>> I tried once to see use git-svn with james/current but was
>>> unsuccessful. git-svn does not know how to use svn:externals.
>>> My knowledge in git was very limited. I will give it a try this
>>> weekend maybe and if things go well I'll get back.
>>>
>>> Good luck,
>>>
>>>
>>> 2012/6/14 Jochen Gazda<gazdahimself@gmail.com>:
>>>>
>>>> Thank you for your prompt reply, Eric.
>>>>
>>>>> I saw you created  james/trunk/sandbox/git-branches/, but not sure why.
>>>>
>>>>
>>>> I supposed that --tags and --branches parameters of git svn init may
>>>> not be left unset and there are no branches and tags in SVN under
>>>> asf/james. Anyway, it did not help. james/trunk/sandbox/git-* can be
>>>> removed.
>>>>
>>>> I will try some of your proposals.
>>>>
>>>> Best,
>>>>
>>>> gazda
>>>>
>>>> On Thu, Jun 14, 2012 at 11:10 AM, Eric Charles<eric@apache.org>  wrote:
>>>>>
>>>>> Hi Gazda,
>>>>>
>>>>> I saw you created  james/trunk/sandbox/git-branches/, but not sure why.
>>>>>
>>>>> The 3 ways I can imagine to work with Apache James git repo are:
>>>>>
>>>>> 1. clone the git repo on your laptop, add a remote to your github, push
>>>>> to
>>>>> the defined remote
>>>>>
>>>>> 2. import your local svn to your github repo (will all the history).
>>>>>
>>>>> 3. remove all .svn folders from your local svn repo, and push this
>>>>> plain
>>>>> source to your github repo.
>>>>>
>>>>> I would have gone for Option 3. which is quite to benefit from the
>>>>> diffs you
>>>>> have to show us without the history.  Once OK, a diff (git diff) could
>>>>> be
>>>>> reapplied to the james svn.
>>>>>
>>>>> Option 1. is should also be easy.
>>>>>
>>>>> I already worked with Option 2. (svn to git) for another project, but
>>>>> the
>>>>> import process takes some long time and can give you surprises...
>>>>>
>>>>> Of course, the james multi-project nature will not help you...
>>>>>
>>>>> Thx, Eric
>>>>>
>>>>>
>>>>>
>>>>> On 06/14/2012 10:40 AM, Jochen Gazda wrote:
>>>>>>
>>>>>>
>>>>>> Gentlemen,
>>>>>>
>>>>>> is there anybody here who has managed it to create a working dir
with
>>>>>> git-svn?
>>>>>>
>>>>>> I am trying to apply "Git for Apache committers" as decribed here
>>>>>> http://wiki.apache.org/general/GitAtApache . This is what I am doing:
>>>>>>
>>>>>> -------8<--------------------
>>>>>> #!/bin/bash
>>>>>>
>>>>>> set -x
>>>>>> set -e
>>>>>>
>>>>>> # put your ASF user name here:
>>>>>> ASF_USER_NAME=
>>>>>> ASF_USER_EMAIL="$ASF_USER_NAME@apache.org"
>>>>>>
>>>>>> PROJECT_NAME="james"
>>>>>> TRUNK="current"
>>>>>>
>>>>>> # created dummy branches and tags just to exclude the possibility
that
>>>>>> git-svn needs them
>>>>>> BRANCHES="trunk/sandbox/git-branches"
>>>>>> TAGS="trunk/sandbox/git-tags"
>>>>>>
>>>>>> git clone git://git.apache.org/"$PROJECT_NAME".git
>>>>>> cd "$PROJECT_NAME"/.git; wget http://git.apache.org/authors.txt;
cd ..
>>>>>> git config svn.authorsfile ".git/authors.txt"
>>>>>> # check if your username and email are identical to those in the
>>>>>> author
>>>>>> file
>>>>>> # git config user.name
>>>>>> # git config user.email
>>>>>> # if they are not identical, set the ASF values locally
>>>>>> git config user.name "$ASF_USER_NAME"
>>>>>> git config user.email "$ASF_USER_EMAIL"
>>>>>> git svn init --prefix=origin/ --tags="$TAGS" --trunk="$TRUNK"
>>>>>> --branches="$BRANCHES"
>>>>>> https://svn.apache.org/repos/asf/"$PROJECT_NAME"
>>>>>> #git svn init --prefix=origin/
>>>>>> "https://svn.apache.org/repos/asf/$PROJECT_NAME/$TRUNK"
>>>>>> git svn rebase
>>>>>> -------8<--------------------
>>>>>>
>>>>>> It is the last command "git svn rebase" that fails with this message:
>>>>>>
>>>>>>   Unable to determine upstream SVN information from working tree
>>>>>> history
>>>>>>
>>>>>> Does anybody have an idea what is the problem here?
>>>>>>
>>>>>> Best,
>>>>>>
>>>>>> gazda
>>>>>>
>>>>>> ---------------------------------------------------------------------
>>>>>> To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
>>>>>> For additional commands, e-mail: server-dev-help@james.apache.org
>>>>>>
>>>>>
>>>>> --
>>>>> eric | http://about.echarles.net | @echarles
>>>>>
>>>>> ---------------------------------------------------------------------
>>>>> To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
>>>>> For additional commands, e-mail: server-dev-help@james.apache.org
>>>>>
>>>>
>>>> ---------------------------------------------------------------------
>>>> To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
>>>> For additional commands, e-mail: server-dev-help@james.apache.org
>>>>
>>>
>>>
>>>
>>> --
>>> Ioan Eugen Stan / http://axemblr.com / Tools for Clouds
>>
>>
>>
>>
>
> --
> eric | http://about.echarles.net | @echarles
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
> For additional commands, e-mail: server-dev-help@james.apache.org
>



-- 
Ioan Eugen Stan / http://axemblr.com / Tools for Clouds

---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message