Merging XMPP SoC branch

[Richard Laager]

On Sat, 2007-07-14 at 03:39 -0400, Evan Schoenberg wrote:
> I've been following the monotone transition since day 1 on the pidgin
> (then-gaim) cabal list, and have been using it since the official
> pidgin transition to monotone.  I have no idea whatsoever how Augie
> and Andy would go about setting up the distributed-but-shared
> versioning you describe.  Can you please recommend some reading
> (preferably more specific than "read the monotone wiki!") for how this
> works conceptually and practically?

Seriously, have you actually read the Monotone documentation? I suspect
not. This is covered in the tutorial, which was one of the first things
I read: http://monotone.ca/docs/Tutorial.html#Tutorial

Specifically, you might find these two sections useful:
http://monotone.ca/docs/Basic-Network-Service.html#Basic-Network-Service
http://monotone.ca/docs/Synchronising-Databases.html#Synchronising-Databases

Basically, everyone commits to their database as normal, and then they
either need to "mtn push" it to someone running "mtn serve" or they need
to run "mtn serve" and the other person can run "mtn pull". The former
requires write permission on the serving side while that latter requires
read permission on the serving side.

Also, this is the section on branching and merging:
http://monotone.ca/docs/Branching-and-Merging.html#Branching-and-Merging

Richard
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
URL: <http://pidgin.im/pipermail/devel/attachments/20070714/9e5c301c/attachment.sig>