Re: ANNOUNCE: Debian build scripts on a public Monotone server

[Ludovic Brenta <ludovic@ludovic-brenta.org>]

Brian May <bam@snoopy.apana.org.au> writes:
> So maybe Subversion will improve in the future...
>
> However, right here and now, Monotone already does what Ludovic's
> wants,

Well put.

> and I must say it does look very interesting.
>
> I find it interesting in Monotone you can commit changes even if your
> tree is not up-to-date, so you only commit your changes first go, and
> then you do the merge. As opposed to being forced to do both in the
> one commit (I never liked this model).

That's funny because it took me a little while to get used to the
"commit first, merge then" model.  I wasn't used to it.  Now I like it
quite a lot.

> There are still some thing on this I am curious about though, for
> example, what happens if two people try to merge conflicting trees at
> the same time?

They cannot merge conflicting trees at the same time, because they
operate on two distinct databases.

- if they both arrive at the same result, identified by its SHA1
  (which is the common case thanks to automatic merge), then they end
  up with the exact same version in their databases.  When they next
  sync, nothing happens since they are already in sync.

- if they arrive at different results, perhaps because they resolved
  conflicts differently, then the branch has two heads, just as
  before.  When they next sync, both will see both heads, and merge if
  they want to.  Monotone sees nothing wrong with a branch having two
  or more heads.

-- 
Ludovic Brenta.