Subrepository Merging

[Thomas, Paul]

Hello,

I'll do my best not to bore people with details, but am happy to explain further if needed. My team are using subrepositories. I have noticed two different behaviours when merging changes in a superrepository. The first case, which I want to happen, is I am given the option of merging each subrepo, or picking one of the two parent revisions (I think you like to call this a fast forward merge). The second, which appears to occur if the source for a subrepo specified in .hgsub changes between the merged parent revisions (purely based on the messages I get on command line), gives me a choice of parent revisions but no opportunity to merge. My questions are:


1.       Is the above correct or have I misunderstood something?

2.       If it is correct, what is the motivation for this difference?

Thanks, and apologies if this duplicates a previous thread, I have checked but I'm afraid I don't have time to search very carefully.

Paul


The contents of this e-mail are confidential and for the exclusive use of the intended recipient.
If you are not the intended recipient you should not read, copy, retransmit or disclose its contents.
If you have received this email in error please delete it from your system immediately and notify us either by email or telephone.
The views expressed in this communication may not necessarily be the views held by McLaren Applied Technolgies Limited.
McLaren Applied Technologies Limited | McLaren Technology Centre | Chertsey Road | Woking | Surrey | GU21 4YH | UK | Company Number: 02322992 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140121/9f553569/attachment-0002.html>