[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: import inconsistency

From: Paul Edwards
Subject: Re: import inconsistency
Date: Mon, 16 Jun 2003 11:33:57 GMT

"Pierre Asselin" <pa@invalid.invalid> wrote in message 
> Paul Edwards <kerravon@nosppaam.w3.to> wrote:
> > All the messages I have seen in here appear to be coming from
> > people who use the head.  I haven't seen any indication that
> > people are adding files on a branch and then importing over
> > them either.
> Having a trunk is normal.  Your branches that never get merged are
> very unusual.  Your imports into such trees are *exceedingly* unusual.

I had another thought about this.  Let's take a project we are
more familiar with - CVS itself.

There's actually two versions of CVS, potentially even more,
but let's say 2.  cvs1-11-x and cvs1-12-x when all is said and done.

Assuming you wish to operate on your own machine, not
permanently connected to the internet, you would have imported
these as a foreign source.

So you have two vendor branches, with the above names.
No head yet.

And you've been diligently importing every drop of cvs1-11,
ie cvs1-11-1, cvs1-11-2 up to cvs1-11-6.  It is only on
cvs1-11-6 that you decided you had a mini-project to fix a
problem here.  Some codswallop about diff/rdiff not working
properly.  The logical thing to do is whinge like
hell^H^H^H^H^H^H^H^H^H^H^H make a branch on
cvs1-11-6, with cvs rtag -b -r cvs1-11-6 difffix-1-11 ccvs.

You may not even finish your project before cvs1-11-7 comes
out, so you end up merging cvs1-11-7 onto you branch so that
you don't need to stuff around with another branch for no
particular reason.

Since variety is the spice of life, you decide to fix the Attic
misnomers by creating an attic-1-12 branch off cvs1-12-1.
This is a structural change that is more appropriately
destined on that release.

Everything sensible so far.  Your attic-1-12 project creates
a new file, it goes to the Attic.  You submit your changes
to date.  The changes get accepted, but not yet released.
Later on you realise the change isn't 100% complete, so you
start adding some more enhancements.  cvs1-12-2 is released.
You import that, and bring those changes onto your branch
(without losing your latest enhancements).

Strange Thing 1: The new file you added stays in the Attic.

Strange Thing 2: The join of cvs1-12-2 came up with "has
been added" causing a subsequent loss of code because Derek
actually added some comments to your submission.

Strange Thing 3: People are perplexed why you don't use the
Attic, while as far as you can tell, you've set everything up in
the most logical manner possible.

Go figure.  :-)

BFN.  Paul.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]