bazaar-ng talk on darcs mailinglist.

[Scott James Remnant]

On Wed, 2005-03-23 at 22:55 +1100, Martin Pool wrote:

> As of 22:24 tonight, I am leaning towards something a bit more like the
> monotone model, and somewhat like the darcs model, where the revision
> comes in and unless it's a trivial merge there is a separate commit to
> put it on the destination branch.
> 
A simple heuristic could be that if the user does a merge inside a
working tree, leaving any details of the merge operation except the
"from" up to bzr to decide, it applies the result to the tree and lets
the user commit it.

If the user does the merge outside a working tree with full details of
both from and destination of the merge, it does the commit itself if
possible otherwise fails.

Scott
-- 
Scott James Remnant          Ubuntu Down Under -- 25th - 30th April 2005
scott at ubuntu.com                     Vibe Rushcutters, Sydney, Australia
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050323/db9317b8/attachment.pgp