[Monotone-devel] Re: multiple heads...

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Emile Snyder wrote:
> On Fri, 2006-03-03 at 20:56 +0100, Tim Ansell wrote:

<snip>

>>Say in CVS, when I create a branch called "Mithro's Changes" I now have
>>two "heads", the latest version of the main branch (which CVS refers to
>>as HEAD) and the latest version of the "Mithro's Changes". At any stage
>>I can in theory merge the two branches back together (which is a pain
>>under CVS that nobody actually does it).
> 
> 
> Exactly.  With monotone, it's not painful at all.  You can decide at
> commit time that your work belongs in a new branch, repeated merges work
> well, etc. etc..

This isn't completely true, they work well with 0.26pre using mark and
merge, but not quite with <0.25 3-way algo.

Two other things:
* I'd really like a 'monotone patch-commit' command which I can feed a
patch and it will add/drop/rename + commit the stuff inside.
* lua hooks inside the repository, someone called it 'management
branches', but I'd just like to ships some hooks inside OE.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Darwin)

iD8DBQFECLcUMkyGM64RGpERAhDPAJ976qtL8XfYk9J83Qhg/khs9L5m7gCeMhfU
yn9INJsDyYZgKKzjO9hXndA=
=Aw52
-----END PGP SIGNATURE-----