List of things I don't like about using Monotone
Ethan Blanton
elb at psg.com
Mon Apr 30 10:01:45 EDT 2007
Richard Laager spake unto us the following wisdom:
> On Mon, 2007-04-30 at 09:38 -0400, Ethan Blanton wrote:
> > as rlaager can attest,
> > merges with a lot of conflicts can still be painful, until workspace
> > merge gets all fixed up.
>
> In reality, if we had 5-way merging instead of 3-way, this would totally
> be fine. I manually obtained the diffs the other day and then ran mtn
> merge and it was easy. If that was available within Meld, it'd be
> trivial. The only problem it wouldn't address is the ability to make
> sure it compiled and worked before committing the merge.
If you can identify specific revisions in history which would have
been useful to you, I'm sure the monotone developers would be thrilled
to hear about them. (I realize this was a little more complicated, in
that some of the history wasn't *from* history, but from parallel
patches, but still.)
Ethan
--
The laws that forbid the carrying of arms are laws [that have no remedy
for evils]. They disarm only those who are neither inclined nor
determined to commit crimes.
-- Cesare Beccaria, "On Crimes and Punishments", 1764
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://pidgin.im/pipermail/devel/attachments/20070430/593e203b/attachment.sig>
More information about the Devel
mailing list