[issue3019] Migrate commited files to subrepo prevents switching branches

[Ringo De Smet]

New submission from Ringo De Smet <ringo.desmet at gmail.com>:

I have a master repository with a few branches. In this repository I 
migrated a certain folder to a subrepo on branch 'default'. My other 
branches remain as is. 'hg update' from default to such another branch is 
not possible as the subrepo is in the way to put the committed files back.

An example:
ringods at AtrisoBook ~/Projects/B-Virtual/DSS-buchla
$ hg update -r d64fa8434046
pulling subrepo site_scons from ssh://hg@main.b-virtual.org/site_scons
requesting all changes
adding changesets
adding manifests
adding file changes
added 12 changesets with 19 changes to 10 files
131 files updated, 0 files merged, 123 files removed, 0 files unresolved

ringods at AtrisoBook ~/Projects/B-Virtual/DSS-buchla
$ hg update -r 2.1
abort: path 'site_scons/site_tools/SubstInFile.py' is inside repo 
'site_scons'

After this operation, the repository is in an undefined state:

ringods at AtrisoBook ~/Projects/B-Virtual/DSS-buchla
$ hg status
M performance/1M-curl-PUT.sh
M performance/curl-PUT-GET-standalone.sh
M setup_DSS_buchla_devenv.sh
M share/image/AmpliStor.png
M share/image/Amplidata.png
M share/image/mainbg2.png
! .hgsub
! .hgsubstate
! src/ocaml/blockstore/test/DummyBlockStore.ml
! src/ocaml/blockstore/test/Test_blockstore_registry.ml
! src/ocaml/node/test/Test_RemoteNodeHttpAlt.ml
! src/ocaml/types/address.mli
? performance/sds_down_1.sh

Don't know what the expected behaviour is, but this prevents me to migrate 
to subrepos as our developers switch branches very frequently. Shouldn't the 
subrepo be put aside so that the committed files on the target branch be put 
in the workspace?

----------
messages: 17508
nosy: ringods
priority: bug
status: unread
title: Migrate commited files to subrepo prevents switching branches

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue3019>
____________________________________________________