[LDAPsh-devel] Needed CVS knowledge

[Rafael C. <Raf...@li...>]

Hi,
I merged James patches into HEAD.

I'm not a CVS specialist (I'm not a specialist of anything at all ;-))
I hope it's all OK.

I followed the instructions of James:

    cvs up -kk -r 1.17 ldapsh && \
    cvs up -kk -j 1.17 -j 1.17.2.1 ldapsh && \
    cvs up -kk -j 1.17 -j 1.17.4.1 ldapsh && \
    cvs up -kk -j 1.17 -j 1.17.6.1 ldapsh && \
    cvs up -kkv -j 1.17 -j 1.20 ldapsh && \
    cvs up -kk -j 1.20 -j 1.20.2.1 ldapsh && \
    cvs up -kk -j 1.20 -j 1.20.4.1 ldapsh && \
    cvs up -kk -j 1.20 -j 1.20.6.1 ldapsh
    # now, edit the conflict by merely removing the conflict
    # markers (and leaving all the new code in there!)
    cvs up -kk -j 1.20 -j 1.20.8.1 ldapsh

At the end, I was not able to commit. I got:
cvs server: sticky tag `1.17' for file `ldapsh' is not a branch

So I've done a cvs up -A ldapsh. This generated a lot of conflicts. I
copied the ldapsh I had just prior to run the "cvs up -A" into ldapsh
and commited.
This created 1.21.

If this was not the right way please let me know and I'll try to do the
right way!!

If this it's Ok for you and it runs ok for a few weeks, I will build a
complete release (tarball with the shell, the documentation, sample
.ldapshrc etc...).

Enjoy,
Rafael