Mailing-List: contact dev-help@directory.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Apache Directory Developers List" <dev@directory.apache.org>
Received-SPF: pass (nike.apache.org: domain of elecharny@gmail.com designates
 74.125.82.44 as permitted sender)
Received-SPF: pass (google.com: domain of elecharny@gmail.com designates
 10.180.24.4 as permitted sender) client-ip=10.180.24.4;
Message-ID: <4F4BE5EB.6000702@gmail.com>
Date: Mon, 27 Feb 2012 21:22:03 +0100
From: =?UTF-8?B?RW1tYW51ZWwgTMOpY2hhcm55?= <elecharny@gmail.com>
Reply-To: elecharny@apache.org
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7;
 rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2
MIME-Version: 1.0
To: Apache Directory Developers List <dev@directory.apache.org>
Subject: Re: Txn branch issues
References: <4F4BAFDC.80806@gmail.com>
 <CALhXAG16OpMSad-wG=_iKp03NXaGO-hdDL=bcmcxi9XtWfx2fw@mail.gmail.com>
 <CAG8=FRiD_hMT1_rY-F2urGEP3PwsJ6XypPjpFXW4R=XN1iMJxA@mail.gmail.com>
 <CALhXAG3ZHTwCawdN_OCHPanhoxKvd9Ri7o1w7t-KaeAdpt2bFw@mail.gmail.com>
 <4F4BD2F4.4050604@gmail.com>
 <CALhXAG3HRd7_wU6ZJre3oX-X=MvT23RNHQdrpSBXwwTekmjY3A@mail.gmail.com>
In-Reply-To: 
 <CALhXAG3HRd7_wU6ZJre3oX-X=MvT23RNHQdrpSBXwwTekmjY3A@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit

Selcuk,

before doing anything, *do* a backup of you changes. Save them somwhere 
(even if it's merged with the svn up you've did).


Le 2/27/12 8:31 PM, Selcuk AYA a écrit :
> How do I revert a file while preserving my local changes? Is that
> possible with svn once I do an svn up? I could you could revert the
> latest commit and doing an svn up on my side would resolve the issue.
>
> thanks
> Selcuk
>
> On Mon, Feb 27, 2012 at 11:01 AM, Emmanuel Lécharny<elecharny@gmail.com>  wrote:
>> Le 2/27/12 7:57 PM, Selcuk AYA a écrit :
>>
>>> thanks Emmanuel. I put my fixes on top of your changes which were
>>> there last week(when I started working on the code again). Only
>>> reverting to that point is good enough. Once I can verify the tests
>>> and check in the code, I will give a status update.
>> Oh, ok. So then you can simply revert up to the version you find useful.
>> Don't be afraid to 'delete' whatever I did, in any case, if for any (stupid)
>> rrason I need to get it back, subversion will have keep it.
>>
>> Many thanks !
>>
>> FYI, I have debugged a bit more and found that the added entry with the
>> 'person' OC has somehow mess up the UUID index, so now, all the entries are
>> linked to the<person,<added entry UUID>>  pair.
>>
>> I have some trace if you need, but I guess you already fixed it.
>>
>>
>>
>>
>> --
>> Regards,
>> Cordialement,
>> Emmanuel Lécharny
>> www.iktek.com
>>


-- 
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com