Odd prompt while merging changed subrepo (use local/remote source prompt)
Created originally on Bitbucket by janrysavy
Note: example for this problem is attached, testing central repository is available on https://janrysavy@bitbucket.org/janrysavy/thgtest1
Problem: We have main repository thgtest1 with one sub repository thgtest1subrepo. File in thgtest1subrepo\file1.txt is changed on central (sub) repository, while it is also changed on local version (see attached thgtest1.zip). When I start THG for local thgtest1 repository and run the Pull command, new revision 2 is downloaded from central repository. Now I run Update to rev 2 command.
I will get question Confirm Update: Discard/Shelve/Merge/Cancel. Choose Merge.
And here comes the problem. Following prompt is displayed: TortoiseHg Prompt / subrepository sources for thgtest1subrepo differ use (l)ocal source (ccbce7810903) or (r)emote source (cea29aaf71d6)? (see attached thgtest1prompt.png).
We think this prompt should not be displayed because thgtest1.hgsubstate is already updated to new version, so when I choose "Local" option, I will get odd state of repository. Is there any reason why "Remote" command is not performed without asking?
To reproduce this problem, just unpack attached thgtest1.zip, run Pull > Update to rev 2 > Merge.
Attachments: thgtest1.zipthgtest1prompt