[PATCH 3 of 5] subrepo: fix hgrc paths section during subrepo pulling

Eric Eisner eric.d.eisner at gmail.com
Mon Mar 15 08:16:27 CDT 2010


On Mon, Mar 15, 2010 at 08:51, Steve Losh <steve at stevelosh.com> wrote:
> On Mar 15, 2010, at 6:46 AM, Saint Germain wrote:
>
>> Hello,
>>
>> 2010/3/15 Edouard Gomez <ed.gomez at free.fr>:
>>
>>>> For my part I would very much like any input/advice about this patch:
>>>> http://www.selenic.com/pipermail/mercurial-devel/2010-March/019313.html
>>>> As I personnaly think that it is essential to subrepo management (to
>>>> guarantee that we are in a particular state with no 'dirty' subrepo).
>>>
>>> Should be nice to force a clean state on subrepos too when main is "up -C"
>>>
>>> However I would prefer to have default behavior to recurse and a "-N"
>>> option for a not recursive behavior.
>>>
>>
>> Steve Losh (sjl) was (correctly I think) afraid that a "up -C" would
>> carelessly wipe out any changes not commited on the subrepo.
>> So we decided on an additional flag to specify that we _really_ want
>> this behavior and an error message if we just try to use "up -C".
>> However  this might be a good idea to indroduce a --subrepo flag which
>> could be also used for any operations that might also operate on
>> subrepo (like "status" for instance, or even "commit").
>
> Commit already commits subrepos as well (though that behavior doesn't feel right to me).
>
> I think 'hg archive' and 'hg status' would be good candidates for a '--subrepos' flag.

I think 'hg status' and 'hg diff' should be consistent with 'hg
commit' (whichever default). A fundamental invariant in my head is
that status and diff are what the commit is about to be.

Other commands which don't care about the working copy (archive, grep,
cat, locate, etc) would benefit from a --subrepo flag.

Regards,
-Eric


More information about the Mercurial-devel mailing list