Merges recursing into subrepository branches

paul_nathan at selinc.com paul_nathan at selinc.com
Mon Jan 23 18:52:22 UTC 2012


Matt Mackall <mpm at selenic.com> wrote on 01/23/2012 08:11:14 AM:

> From: Matt Mackall <mpm at selenic.com>
> To: paul_nathan at selinc.com
> Cc: mercurial at selenic.com
> Date: 01/23/2012 08:11 AM
> Subject: Re: Merges recursing into subrepository branches
> 
> On Fri, 2012-01-20 at 14:43 -0800, paul_nathan at selinc.com wrote:
> > Hi,
> > 
> > How does recursive subrepository merge (ie, merging the contents of 
> > subrepos between branches) behavior get altered to select the *state* 
of 
> > the subrepo, instead of attempting to merge the subrepo branches? Is 
there 
> > a --config option or .hgrc option to select behavior?
> 
> No such option exists.

Is there a plan for such an option to exist? It would be *very* useful to 
the aforementioned repository layout.

> 
> > --- discussion ---
> 
> This was too confusing.

Can I clarify?


> 
> -- 
> Mathematics is the supreme nostalgia of our time.
> 
> 


- - -
Regards,
Paul Nathan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20120123/af0a922a/attachment-0002.html>


More information about the Mercurial mailing list