incubator-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dennis Lundberg <denn...@apache.org>
Subject Re: Podling to use native git
Date Sat, 02 Oct 2010 15:45:37 GMT
IDEA 9 uses the SVNKit library [1] for its Subversion integration.
Version 9.0.3 of IDEA uses SVNKit/1.3.3 which corresponds to SVN/1.6.11.


[1] http://svnkit.com/

On 2010-10-02 10:14, Mark Struberg wrote:
> I personally use 1.6.9 on 2.6.35-x86_64, but the guy who merged and most others use Idea9
(not sure which SVN versions Idea and Eclipse use), and we also have 2 Tortoise SVN users.
After he crashed the branch by trying to merge with idea, he also switched to the commandline.
Seems this was too late ;)
> 
> LieGrue,
> strub
> 
> --- On Fri, 10/1/10, Greg Stein <gstein@gmail.com> wrote:
> 
>> From: Greg Stein <gstein@gmail.com>
>> Subject: Re: Podling to use native git
>> To: general@incubator.apache.org
>> Date: Friday, October 1, 2010, 11:07 PM
>> Yup. The 1.5.x release introduced a
>> feature called "merge tracking",
>> but you really want to use 1.6.x (where many merge tracking
>> issues
>> were fixed/improved/sped-up). It remembers which revisions
>> have been
>> merged into a given location in the repository. This means
>> bringing a
>> branch up to date is easy: it just takes any revisions from
>> trunk that
>> haven't (yet) been merged and applies them to the branch.
>>
>> When the branch is ready, you merge back to trunk with the
>> --reintegrate switch. That takes any revisions on the
>> branch which are
>> *not* those which came from trunk, and applies them onto
>> trunk. ie.
>> just the work you did on the branch.
>>
>> If you're getting conflicts, then maybe you missed the
>> --reintegrate
>> switch? Something is going on because (of course) that is
>> exactly what
>> the tracking is there to prevent.
>>
>> It is important that everybody uses at least a 1.5.x client
>> (and even
>> better if the server blocks earlier clients); otherwise,
>> early clients
>> will not report the merge.
>>
>> Cheers,
>> -g
>>
>> On Fri, Oct 1, 2010 at 18:00, Mark Struberg <struberg@yahoo.de>
>> wrote:
>>> It seems that with 1.6 SVN did learn a bit about the
>> 'git way' (apologize if it was even earlier and has nothing
>> to do with git). SVN now applies merges bit by bit it seems
>> (tested with 1.6.9). But I still have problems with
>> intermediately merged projects (merging the trunk into my
>> branch ~ every 2nd day). Somehow I ended up having the same
>> pieces in my branch and in my trunk, but both got marked as
>> conflict.
>>>
>>> Anyway, SVN is the way to go for now.
>>>
>>> LieGrue,
>>> strub
>>>
>>> --- On Fri, 10/1/10, Jochen Wiedmann <jochen.wiedmann@gmail.com>
>> wrote:
>>>
>>>> From: Jochen Wiedmann <jochen.wiedmann@gmail.com>
>>>> Subject: Re: Podling to use native git
>>>> To: general@incubator.apache.org
>>>> Date: Friday, October 1, 2010, 9:48 PM
>>>> On Fri, Oct 1, 2010 at 11:44 PM, Greg
>>>> Stein <gstein@gmail.com>
>>>> wrote:
>>>>
>>>>> I do branches all the time in Subversion, and
>> don't
>>>> see problems. We
>>>>> periodically update the branch from trunk,
>> and when
>>>> the work is done,
>>>>> merge the branch back onto trunk. These are
>>>> straight-forward
>>>>> operations, so I don't understand where your
>> pain
>>>> point is.
>>>>>
>>>>> If you could explain a bit, then that would
>> be
>>>> helpful.
>>>>
>>>> Just out of curiosity: If you pull in changes from
>> the
>>>> trunk to the
>>>> branch, how do you merge the branch later on? I'd
>> consider
>>>> the changes
>>>> a problem that have been done in both branches.
>> (Unlike
>>>> git, which
>>>> "knows" about these simultaneous changes.)
>>>>
>>>> Thanks,
>>>>
>>>> Jochen
>>>>
>>>> --
>>>> I Am What I Am And That's All What I Yam (Popeye)
>>>>
>>>>
>> ---------------------------------------------------------------------
>>>> To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
>>>> For additional commands, e-mail: general-help@incubator.apache.org
>>>>
>>>>
>>>
>>>
>>>
>>>
>>>
>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
>>> For additional commands, e-mail: general-help@incubator.apache.org
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
>> For additional commands, e-mail: general-help@incubator.apache.org
>>
>>
> 
> 
>       
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
> For additional commands, e-mail: general-help@incubator.apache.org
> 
> 


-- 
Dennis Lundberg

---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
For additional commands, e-mail: general-help@incubator.apache.org


Mime
View raw message