monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] Branch Propagation


From: Daniel Carosone
Subject: Re: [Monotone-devel] Branch Propagation
Date: Fri, 11 Aug 2006 08:11:46 +1000
User-agent: Mutt/1.5.12-2006-07-14

On Thu, Aug 10, 2006 at 04:38:29PM +0200, address@hidden wrote:
> explicit_merge seems to be what you want (plus an improved propagate UI that 
> allows selecting between heads)
> 


right. you can think of:

  propagate branch-a branch-b

as a convenience shorthand for

  explicit_merge h:branch-a h:branch-b branch-b

since (apart from the auto-generated changelog template) the behaviour
and result is identitical, including failing where either h: selector
is ambiguous.  Using the longer form of course allows more selective
selectors to disambiguate:

  explicit_merge h:branch-a/a:matt h:branch-b/6341 branch-b

Both 'propagate' and 'merge' are designed to embody common assumptions
and practices about how branches and development practices are likely
to be used.  In both cases, you can fall back to explicit_merge if you
want to be more, well, explicit about exactly what you need.

--
Dan.

Attachment: pgp15gj8QgG6p.pgp
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]