Hi Larry!
>
> Andreas Otte writes:
> >
> > This is a multi-part message in MIME format.
>
> Please do not post MIME and/or HTML encrypted messages to the list.
> Plain text only, PLEASE!
>
> > Content-Type: text/plain;
> > charset="iso-8859-1"
> > Content-Transfer-Encoding: base64
>
> And base64 encoding plain text is just silly -- all it does is make it
> unreadable and take up more space.
>
Sorry about that, seems to be a misconfiguation on our mail server or a
bug in the mail client. If you ask me the whole system is a bug.
> > But new feature development happens on the trunk and at some point I
> > decide to move some features (which are in files that are
> not changed in
> > the customers version) to the version of the customer. I could do a
> > merge against the trunk on that files, but I don't want to do that,
> > because that would create more changed files on the branch
> (with branch
> > revisions) which are not really different from the trunk. Instead I
> > would like to "move" the new trunk revision on to the
> branch. Is this
> > in any way possible? For example by moving the internal
> (unused) branch
> > tag for that file to the other version and then do an update on that
> > file on the branch?
>
> Exactly. You can use "cvs tag -FBb" on those specific files
> to move the
> branch tag from the old revision to the current revision (or whatever
> revision you want).
>
> -Larry Jones
cvs tag -r HEAD -Fb BRANCH file
will move the branch tag to the head revision.
Thanks
Andreas
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
