monotone-devel
[Top][All Lists]
Advanced

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

Re: [Monotone-devel] some basic notes on object versioning


From: Nathaniel Smith
Subject: Re: [Monotone-devel] some basic notes on object versioning
Date: Mon, 6 Jun 2005 02:52:19 -0700
User-agent: Mutt/1.5.9i

On Mon, Jun 06, 2005 at 11:15:39AM +0200, Georg-W. Koltermann wrote:
> I'm not sure how much the lifetime means here.  There is certainly a
> point in time (birth) when an object is first added, but dropping would
> just remove the object from some revision.  The object would still exist
> in other revisions and other branches as well.  It might actually be
> merged again later, so it might exist in the mainline branch Mon thru
> Wed, be deleted Thu and Fri, and be merged into mainline again (from
> some other branch) on Sat.

Monotone ATM considers file resurrection to be impossible (as do all
the other modern VCSes I can think of off-hand, though this
particular corner isn't something I'm super-familiar with
everywhere...).  What this means is that they enforce the invariant
that once a file is dead in a revision R, it is dead in all
descendents of that revision.  If you want to merge it back in from
another branch, well, firstly you have to do some work, because the
merge will just delete it, and secondly, the best you can do is to get
a drop/add pair that breaks its history across the merge.

-- Nathaniel

-- 
Eternity is very long, especially towards the end.
  -- Woody Allen




reply via email to

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