I just merged the maven-2 and the maven-3 git repo back together using
something like this:

git clone http://git.apache.org/maven-3.git
cd maven-3
git remote add m2 http://git.apache.org/maven-2.git
git fetch m2

And it works perfectly; you can even run git merge-base maven-2.2.x
trunk to find the branch point ;)

They share common history in the existing git clones. If we move the
"maven-3" repo I think we might call it "maven" and just re-add the
maven-2 history.

Kristian



2012/10/11 Anders Hammar <[email protected]>:
> Are we then also saying that we merge the maven-2 source into this git
> repo as well (if we convert that to git)?
>
> /Anders
>
> On Thu, Oct 11, 2012 at 10:01 AM, Arnaud Héritier <[email protected]> wrote:
>> As far as it is always possible (and easy) to do (and to setup on CI side
>> as it will be the first one to run them) I'll follow you.
>>
>> Arnaud
>>
>> On Thu, Oct 11, 2012 at 9:56 AM, Kristian Rosenvold <
>> [email protected]> wrote:
>>
>>> Initially I thought Arnaud's argument for being able to run against a
>>> different maven version was a "killer"; we needed to keep them
>>> separate.
>>>
>>> After giving it some more thought I'm not sure it's a good argument,
>>> we don't lose the ability to do so if we merge the trees (it's just
>>> one of many possible flags to use when running the its, all available
>>> in the docs)
>>>
>>> So I'm still marginally in favour of merging the trees, if only to
>>> increas focus on the IT's.
>>>
>>> Kristian
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: [email protected]
>>> For additional commands, e-mail: [email protected]
>>>
>>>
>>
>>
>> --
>> -----
>> Arnaud Héritier
>> 06-89-76-64-24
>> http://aheritier.net
>> Mail/GTalk: [email protected]
>> Twitter/Skype : aheritier
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [email protected]
> For additional commands, e-mail: [email protected]
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to