convert-repo problems with symlinks/multiple heads

[John Gateley]

On Thu, 24 May 2007 17:00:20 -0500
John Gateley <mercurial at jfoo.net> wrote:

> [summarized]
> I have a git repository [with two heads, master and experimental]

> [I convert it with convert-repo ]
> and many files are listed as "M" in
> hg status, even though they are really not modified.

> Why are some files listed as "M" after the transfer? (I transferred

I did some testing, this is caused by the two heads in one repository:

1) mkdir multi ; cd multi ; emacs foo.c ; cg init # create the initial git
2) cg switch -r master experimental # create new head
3) emacs foo.c ; cg commit # make an experimental change
4) cg switch master ; emacs foo.c ; cg commit # make a master change
5) cg merge experimental # make the two branches the same
6) cd .. ; mkdir multi-hg ; convert-repo multi multi-hg multi.map

Now: "cd multi-hg ; hg status" will show that foo.c is "M".
foo.c actually has the correct contents (the merge of the
experimental change and the master change above), and is the
same as the last commited version.

But "hg diff" is confusing: it's reporting a difference.
If I revert to the latest committed version, there is no
difference in the files.

I'll probably just try to remove the "experimental" head from
my git repository and try again.

But I'd still appreciate any help with this.

Thanks,

j