[parisc-linux] 2.4.0 merge mangle our tree?

[Matthew Wilcox]

On Wed, Jan 24, 2001 at 11:19:57PM -0500, Michael Ang wrote:
> That seems closer to what you want, but backs out any changes made since
> the merge started.  Not sure what the difference between *_PREMERGE and
> *_PREIMPORT is - you'd have to ask willy, I guess.

_PREIMPORT was a tag laid down by paul.  _PREMERGE was the tag I laid
down before starting the merge.

i'm not sure why i fucked up the branching so badly.  I did:

cvs tag -b LINUS_240_FIXUP
cvs ci
cvs add (several times, adding new directories and new files)
cvs ci
cvs -n up
cvs rm
cvs ci

(taken from my bash history, so i know this is exactly what i did)

the manpage says:

              To create a branch revision, one
              typically use the -b option of the rtag or tag com­
              mands.  Then, either checkout or update can be used
              to base your sources on the newly  created  branch.
              From  that point on, all commit changes made within
              these working sources will be  automatically  added
              to  a branch revision, thereby not perturbing main-
              line development in any way. 

so what did i do wrong?

the other question is how best to fix the mess... if you check out
LINUS_240_FIXUP do you get a non-broken kernel?  does it work?  if so,
let's just put it all back on the HEAD.  if not, we have to try figuring
out something else.

-- 
Revolutions do not require corporate support.