bug-cvs
[Top][All Lists]
Advanced

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

Re: adding on branch


From: Derek Robert Price
Subject: Re: adding on branch
Date: Thu, 29 May 2003 12:32:38 -0400
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02

Stefan Monnier wrote:

But IIRC, the magic branch stuff is done on-top-of RCS rather than
underneath RCS, so changing the CVS trunk to 1.1.1.1 is not going
to change anything to the fact that the branch's GCA is 1.1.  What am
I missing ?

It seems that as long as we don't retroactively change RCS revisions
we should be safe.  I.e. if we only change the magic-handling, things
should keep working.

The way CVS built this on top of RCS is by having each import actually store the text in 1.1 and adding an empty 1.1.1.1. This way if you ask RCS co for revision 1.1 or 1.1.1.1, you will still get what was imported. Later imports are stored only on the vendor branch and do not affect 1.1, so must be magicked out.

Anyhow, this means that allowing an import as currently defined would change the base revision for any branch off 1.1 (e.g. 1.1.2) and corrupt all revisions on that branch.

I'm not sure there are any other ramifacations to defaulting imported revisions 1.1 to dead and storing the text of the import in 1.1.1.1. This might allow the "magic only" fix you postulate since the 1.1.1.!1 magic may simply need to be extended to 1.1.1.1. I'd be interested to see a prototype and test cases.

Mark Baushke & Larry Jones brought up some other interesting cases via private email:

1)  What about dead head revisions > 1.1?
a) Import sets timestamps - what happens if they are earlier than revisions in the archive?
2)  What about head revisions that are not dead?

I think the easiest way to solve the above cases would be to flag a conflict and require a merge, but when this is the initial import, there is no obvoius starting point. Some variation on Steve Cameron's .parent/.base/.trunk patch might be useful here, where .base of a vendor branch returned an empty revision.

Derek

--
               *8^)

Email: address@hidden

Get CVS support at <http://ximbiot.com>!
--
And what if you track down these men and kill them?  What if you murdered all
of us?  From every corner of Europe hundreds, thousands, would rise to take our
places.

                - Paul Henreid as Victor Laszlo, _Casablanca_







reply via email to

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