directory-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Selcuk AYA <ayasel...@gmail.com>
Subject Re: Txn branch merge : headsup
Date Mon, 11 Jun 2012 05:52:24 GMT
Hi Emmanuel.
I think the best way is to first merge the trunk to the branch and
then verify the merge and then merge back to trunk. Please let me know
if it is possible for you to dump your ongoing effort to a branch. If
not, I will try to merge the trunk to the branch I have.

thanks
Selcuk

On Sat, Jun 9, 2012 at 5:24 AM, Alex Karasulu <akarasulu@apache.org> wrote:
>
>
> On Fri, Jun 8, 2012 at 8:58 PM, Emmanuel Lécharny <elecharny@gmail.com>
> wrote:
>>
>> Le 6/8/12 6:50 PM, Selcuk AYA a écrit :
>>
>>> Hi Emmanuel,
>>> if you can give me information on how I can access your ongoing work,
>>> I can help you with AVL changes and change to move xdbm to core and
>>> core-api. Just let me know how and when I can start playing around
>>> with it.
>>
>>
>> I wish I can :/
>>
>> All the changes I have made so far are on my workspace, which is a
>> checkout of apacheds/trunk... If I commit that, trunk will be doomed. I need
>> a couple of hours to find the best way to get all my files moved to a
>> branch, but still having all the conflits.
>
>
> You can shelf your work in SVN like so:
>
> http://markphip.blogspot.com/2007/01/shelves-in-subversion.html
>
>
> --
> Best Regards,
> -- Alex
>

Mime
View raw message