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 <[EMAIL PROTECTED]> wrote:
On 5/21/07, Alex Karasulu <[EMAIL PROTECTED]> wrote: > Enrique, > > On 5/20/07, [EMAIL PROTECTED] <[EMAIL PROTECTED] > 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? 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 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
-- Regards, Cordialement, Emmanuel Lécharny www.iktek.com
