Enrique,

On 5/20/07, erodriguez-1oDqGaOF3Lkdnm+yROfE0A@public.gmane.org <erodriguez-1oDqGaOF3Lkdnm+yR
OfE0A@public.gmane.org> wrote:
>
> Author: erodriguez
> Date: Sun May 20 18:53:07 2007
> New Revision: 539993
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=539993
> 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?

Alex

[ Post a follow-up to this message ]