Re: [parisc-linux] 2.4.0 merge mangle our tree?

[Matthew Wilcox <matthew@wil.cx>]

On Thu, Jan 25, 2001 at 09:56:47AM -0500, Michael Ang wrote:
> On Thu, 25 Jan 2001, Matthew Wilcox wrote:
> > 
> > i'm not sure why i fucked up the branching so badly.  I did:
> > 
> > cvs tag -b LINUS_240_FIXUP
> [What did you do here?  Copy files from a tarball?]

umm.. i did this after i'd merged the 2.4.0 files into my tree.  i didn't
think about doing it on a branch until then.  Should have thought about
it in advance, I guess?

> > cvs ci
> > cvs add (several times, adding new directories and new files)
> > cvs ci
> > cvs -n up
> > cvs rm
> [What kind of files were you removing?]

the ones which `cvs -n up' told me it would have added -- ie the ones
which were deleted by patch.

> You didn't check out or update with the branch tag, so all your changes
> hit the trunk.  I'm not convinced you want to use a branch for merging (I
> prefer doing it on the trunk - it hurts alot but it's over fast) but I
> haven't been following the discussions very closely.

Ugh.  Blah.  The reason I attempted to do it on a branch is that I could
only test it compiled not that it booted (for reasons too complex to
go into here, involving not being able to locate a 110V to 8V AC in
ottawa yet).  Perhaps I should have just not bothered.

> The thing to really avoid is losing local changes.  If you want to do the
> merge on a branch, the best bet is to revert the inadvertent changes to
> the trunk and start over.

Well, I have a directory here which contains what I want to appear in
CVS on the branch.  I'm not getting rid of it!  Would you mind reverting
this mess I've created to before the checkins I did yesterday, and I'll
try again?

-- 
Revolutions do not require corporate support.