[issue1931] convert: hg -> hg with filemap, missing copies from 2nd parent

[Xavier ALT]

New submission from Xavier ALT <dex at phoenix-ind.net>:

Hi,

here is the step to reproduce the behaviour:
--------------------------------------------
$> hg clone http://openobject.code.farfe.lu/addons-50-standalone -r 4591 addons
$> echo "include base_setup" >> hg.filemap
$> hg convert --config convert.hg.startrev=0 --filemap hg.filemap addons
addons.base_setup

we end up with:
---------------
$> cd addons.base_setup
$> hg up
resolving manifests
getting .hgtags
1 files updated, 0 files merged, 0 files removed, 0 files unresolved

so we get nothing, but inside source working directory (addons/base_setup)
all files are present.

thing is we end up with lot of "unmatched file in other"
$> cd addons
$> hg up -r 4588
$> hg up --debug
  searching for copies back to rev 4589
  unmatched files in other:
   base_setup/__init__.py
   base_setup/__terp__.py
   base_setup/base_setup_data.xml
   base_setup/base_setup_demo.xml
   base_setup/base_setup_wizard.xml
   base_setup/i18n/ar_AR.po
   base_setup/i18n/base_setup.pot
  ...

after digging digging I end up with a patch which correct the problem for me
(see file attached). I don't think this problem is really related to
filemap, but more to covnert mercurial source backend.

----------
files: hg-convert-filemap-w-parent2.patch
messages: 11131
nosy: dex
priority: bug
status: unread
title: convert: hg -> hg with filemap, missing copies from 2nd parent

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue1931>
____________________________________________________
-------------- next part --------------
A non-text attachment was scrubbed...
Name: hg-convert-filemap-w-parent2.patch
Type: text/x-patch
Size: 816 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20091201/2f25de0c/attachment.bin>