reorganize

[hamann.w at t-online.de]

Hi Arne,

I seem to have difficulty following your advice
Original folder structure is

repo
  .hg
  part1
  part2
  subrepo
     .hg

I have moved subrepo somewhere else, created subrepo/part3 and moved all files there.
My filemap contains
rename . part3
Next I run
hg convert -s hg --filemap /tmp/fmap .
from within the subrepo. It reports some activity, but hg status on any file in the part3 folder returns a
question mark. 
Next I run
hg pull -f  /path/to/subrepo
This also reports some activity, but  does not create a part3 folder in the repo nor in .hg/store/data

Best regards
Wolfgang Hamann

>> 
>> wolfgang at maas-noten.de writes:
>> 
>> > I somehow managed to create a project  where one of the subfolders has its own .hg subrepo.
>> > Is there a way to reorganize so that it becomes part of the main repo
>> 
>> Copy it out of the main project, reorganize it so all its files are in
>> the correct subfolder (see convert filemap¹), then delete the subrepo in
>> the main repo and pull --force + merge the converted repo into the main
>> repo.
>> 
>> ¹: https://www.mercurial-scm.org/wiki/ConvertExtension#A--filemap
>> 
>> Do take a backup before you start
>> (i.e. via cp -rp main-project main-project-backup-2017-03).
>> 
>> Best wishes,
>> Arne
>> --