[Top][All Lists]

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

Re: What a modern collaboration toolkit looks like

From: Richard Stallman
Subject: Re: What a modern collaboration toolkit looks like
Date: Fri, 04 Jan 2008 00:27:46 -0500

    In modern DVCSes, a push never blocks. The sequence of changesets you
    developed is grafted into the repo as a branch attached to the
    revision you pulled from.

    If no one else has committed or pushed against that revision, the line
    of development remains linear.  If someone has, you have the analogue
    of a CVS conflict -- the revision is now a branch point with two
    histories going forward.  

    Later, someone may do a merge operation that fuses those two branches
    together again.  Thus, "commit-before-merge".

I think I understand that now, but it raises other questions.

Does this mean there is no concept of "trunk"?  When someone who is
not normally a participant in the project decides to "download the
current sources", which revision does he get?  More precisely, what
determines which revision he gets?

The operation analogous to a CVS commit to the trunk
would consist of pushing a new revision and then
whatever else is needed to make that revision the new trunk.

reply via email to

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