[issue3292] Some merge are not converted correctly with a filemap

[Patrick Mézard]

New submission from Patrick Mézard <patrick at mezard.eu>:

Reported here:

  http://selenic.com/pipermail/mercurial/2012-February/042016.html

Test script to reproduce the issue:

  $ cat >> $HGRCPATH <<EOF
  > [extensions]
  > convert=
  > graphlog=
  > EOF

  $ cat > filemap <<EOF
  > exclude dummy
  > EOF
  $ hg init bug
  $ cd bug
  $ echo a > a
  $ hg ci -Am adda
  adding a
  $ echo b > a
  $ hg ci -m changea
  $ hg up 0
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ echo c > c
  $ hg debugsetparents 0 1
  $ hg ci -Am merge
  adding c
  $ cd ..

  $ hg convert bug normal-hg
  initializing destination normal-hg repository
  scanning source...
  sorting...
  converting...
  2 adda
  1 changea
  0 merge
  $ hg -R normal-hg glog --template "{rev} {desc|firstline}\n"
  o    2 merge
  |\
  | o  1 changea
  |/
  o  0 adda
  

  $ hg convert --filemap filemap bug bug-hg
  initializing destination bug-hg repository
  scanning source...
  sorting...
  converting...
  2 adda
  1 changea
  0 merge
  $ cd bug-hg
  $ hg glog --template "{rev} {desc|firstline}\n"
  o  2 merge
  |
  o  1 changea
  |
  o  0 adda
  
  $ hg up
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cat a
  b
  $ cat b
  cat: b: No such file or directory
  [1]
  $ cat c  
  c

----------
messages: 19201
nosy: pmezard
priority: bug
status: unread
title: Some merge are not converted correctly with a filemap
topic: convert

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