Return-Path: Delivered-To: apmail-directory-dev-archive@www.apache.org Received: (qmail 72257 invoked from network); 21 May 2007 16:08:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 May 2007 16:08:15 -0000 Received: (qmail 68022 invoked by uid 500); 21 May 2007 16:08:21 -0000 Delivered-To: apmail-directory-dev-archive@directory.apache.org Received: (qmail 67805 invoked by uid 500); 21 May 2007 16:08:20 -0000 Mailing-List: contact dev-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Apache Directory Developers List" Delivered-To: mailing list dev@directory.apache.org Received: (qmail 67794 invoked by uid 99); 21 May 2007 16:08:20 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 May 2007 09:08:20 -0700 X-ASF-Spam-Status: No, hits=2.0 required=10.0 tests=HTML_MESSAGE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: domain of elecharny@gmail.com designates 66.249.92.173 as permitted sender) Received: from [66.249.92.173] (HELO ug-out-1314.google.com) (66.249.92.173) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 May 2007 09:08:12 -0700 Received: by ug-out-1314.google.com with SMTP id 71so967218ugh for ; Mon, 21 May 2007 09:07:48 -0700 (PDT) DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:reply-to:to:subject:in-reply-to:mime-version:content-type:references; b=KdYPIvfAVKEEwCOTBdE6iCYAeNWU5IF+/AUeBiC6qMBDV6xR7y0lTBiHEBd0pWrmCOlrVIecx+yu0TFWRK2AaqlanpUPqT1Nk0nnADTZLdikmkOdpsjNdZRU4wANh5hdwI1keDIs72ARXIIfOy1Jrs7cKVgP25we18vXKjd0oaM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:reply-to:to:subject:in-reply-to:mime-version:content-type:references; b=jeCtW2opykj2vviQtTtDoi8QrF++FyXxkyIOfOI8CWSPCcuxmiPtxC8vvYdaOxxy4cNP54626pkjiFg0zRvFxtkJAgCvlDA67BnlyNfdJPTD4RS9B1qz6isD8ycAlOgeVQlnAW9tyvF/EIQnMJhmcUoJwS6zJ/Mz/3EAa6vt96k= Received: by 10.78.146.11 with SMTP id t11mr1208519hud.1179763668148; Mon, 21 May 2007 09:07:48 -0700 (PDT) Received: by 10.78.42.13 with HTTP; Mon, 21 May 2007 09:07:47 -0700 (PDT) Message-ID: Date: Mon, 21 May 2007 18:07:47 +0200 From: "Emmanuel Lecharny" Reply-To: elecharny@iktek.com To: "Apache Directory Developers List" , erodriguez@apache.org Subject: Re: svn commit: r539993 [1/2] - in /directory/apacheds/branches/kerberos-encryption-types: btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ constants/src/main/java/org/apache/directory/server/constants/ core-unit/src/te In-Reply-To: <568753d90705210900y525d95a4k3851fdccf3a38873@mail.gmail.com> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----=_Part_80106_19213374.1179763667848" References: <568753d90705210900y525d95a4k3851fdccf3a38873@mail.gmail.com> X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_80106_19213374.1179763667848 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Content-Disposition: inline As Enrique is working on a part of the server which has not been changed except from his own modification, I guess it won't be a big problem. Anyway= , it's better to be warned *before* than to try to fix big problems *after* := ) Emmanuel On 5/21/07, Enrique Rodriguez wrote: > > On 5/21/07, Alex Karasulu wrote: > > Enrique, > > > > On 5/20/07, erodriguez@apache.org wrote: > > > Author: erodriguez > > > Date: Sun May 20 18:53:07 2007 > > > New Revision: 539993 > > > > > > URL: http://svn.apache.org/viewvc?view=3Drev&rev=3D539993 > > > Log: > > > Merged revisions r533844:539990 from ApacheDS trunk to > > 'kerberos-encryption-types' branch. > > > > You seemed to have merged changes from the trunk to your branch. This > is > > going to now make it very > > difficult if not impossible for you to merge your branch back into the > > trunk. What's going to happen is > > you'll get massive amounts of conflicts when you attempt to merge. Are > you > > sure you didn't instead > > want to merge this branch into the trunk? > > Hi, Alex, > > Thanks for reviewing my commits. > > This commit represents feature branch maintenance, straight out of the > SVN redbook: > > > http://svnbook.red-bean.com/nightly/en/svn.branchmerge.commonuses.html#sv= n.branchmerge.commonuses.patterns.feature > > Not only is it good practice to keep a branch in sync with the trunk, > I had to do so in this case because the branch failed to compile due > to a change in a dependency. > > As for conflicts, I performed similar branch maintenance and merge > back-to-trunk as recently as last week (on another project) and I'm > confident I won't have the major issues you describe. > > Enrique > --=20 Regards, Cordialement, Emmanuel L=E9charny www.iktek.com ------=_Part_80106_19213374.1179763667848 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline As Enrique is working on a part of the server which has not been changed ex= cept from his own modification, I guess it won't be a big problem. Anyw= ay, it's better to be warned *before* than to try to fix big problems *= after* :)

Emmanuel

On 5/21/07, Enrique Rodriguez <enriquer9@gmail.com> wrote:
On 5/21/07, Alex Karasulu <akara= sulu@apache.org> wrote:
> Enrique,
>
> On 5/20/07,= erodriguez@apache.org < erodriguez@apache.org > wrote:
> > Author: erodriguez
&g= t; > Date: Sun May 20 18:53:07 2007
> > New Revision: 539993> >
> > URL: http://svn.apache.org/viewvc?view=3Drev&rev=3D539993
> > L= og:
> > Merged revisions r533844:539990 from ApacheDS trunk to
= > 'kerberos-encryption-types' branch.
>
> You seemed= to have merged changes from the trunk to your branch.  This is
> going to now make it very
> difficult if not impossible for = you to merge your branch back into the
> trunk.  What's= going to happen is
> you'll get massive amounts of conflicts whe= n you attempt to merge.  Are you
> sure you didn't instead
> want to merge this branch into= the trunk?

Hi, Alex,

Thanks for reviewing my commits.
This commit represents feature branch maintenance, straight out of the
SVN redbook:

http://svnbook.red-bean.com/nightly/en/svn.branchmerge.commonuses.html#svn= .branchmerge.commonuses.patterns.feature

Not only is it good practice to keep a branch in sync with the = trunk,
I had to do so in this case because the branch failed to compile = due
to a change in a dependency.

As for conflicts, I performed si= milar branch maintenance and merge
back-to-trunk as recently as last week (on another project) and I'm=
confident I won't have the major issues you describe.

Enriqu= e



--
Regards,
Cordia= lement,
Emmanuel L=E9charny
www.iktek.com ------=_Part_80106_19213374.1179763667848--