Robert Collins wrote:
On Tue, 2006-10-17 at 12:08 +0200, Andreas Ericsson wrote:
Robert Collins wrote:
On Tue, 2006-10-17 at 11:20 +0200, Jakub Narebski wrote:
---- time --->
--*--*--*--*--*--*--*--*--*-- <branch>
\ /
\-*--X--*--/
The branch it used to be on is gone...
In bzr 0.12 this is :
2.1.2
Would it be a different number in a different version of bazaar?
The dotted decimal display has only been introduced in bzr 0.12
(assuming the first * is numbered '1'.)
These numbers are fairly stable, in particular everything's number in
the mainline will be the same number in all the branches created from it
at that point in time, but a branch that initially creates a revision or
obtains it before the mainline will have a different number until they
syncronise with the mainline via pull.
So basically anyone can pull/push from/to each other but only so long as
they decide upon a common master that handles synchronizing of the
number part of the url+number revision short-hands?
Anyone can push and pull from each other - full stop. Whenever they
'pull' in bzr terms, they get fast-forward happening (if I understand
the git fast-forward behaviour correctly). After a fast-forward, the
dotted decimal revision numbers in the two branches are identical - and
they remain immutable until another fast forward occurs.
This is where it breaks down for me. "until another fast forward occurs"
is just not good enough, imo.
One thing that's been nagging me is how you actually find out the
url+number where the desired revision exists. That is, after you've
synced with master, or merged the mothership's master-branch into one of
your experimental branches where you've done some work that went before
mothership's master's current tip, do you have to have access to the
mothership's repo (as in, do you have to be online) to find out the
number part of url+number shorthand, or can you determine it solely from
what you have on your laptop?
You can determine it locally - if you know any of the motherships
revisions locally, we can generate the dotted-revnos that the
motherships master-branch would have from the local data - and the last
merge of mothership you did will have given you that details.
To me, this means bazaar isn't distributed at all and I could achieve
much the same distributedness(?) by rsyncing an SVN repo, working
against that and then rsyncing it back with some fancy merging. In other
words, bazaar requires there to be one Lord of the Code, or some of the
key features break down.
--
Andreas Ericsson andreas.ericsson@xxxxxx
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html