Why does MacPorts Mercurial behave differently from Windows Mercurial?

[Arno Hautala]

On Tue, Jan 18, 2011 at 06:07, Russell Jones
<russell.jones at physics.ox.ac.uk> wrote:
> Might be the EOL character sequence differing. Have you tried applying the utilities in the port dos2unix?

It's not an EOL issue, below is the output I receive when running the
sample sequence.
I haven't tested this using the packaged installation from Selenic to
narrow it down as a MacPorts vs Mac bug, but I can say that the Ubuntu
distribution completes a successful merge.

> Script started on Thu Jan 20 21:16:19 2011
>
> $ hg init main
> $ cd main
> $ echo 'This is a boring feature.' > myfile
> $ hg commit -A -m 'We have reached an important milestone'
> adding myfile
> myfile
> committed changeset 0:2b830be9bf29
> $ hg tag v1.0
> .hgtags
> $ echo 'This is exciting and new!' >> myfile
> $ hg commit -m 'Add a new feature'
> myfile
> committed changeset 2:5b08048e1726
> $ cd ..
> $ hg clone -rv1.0 main stable
> 1 changesets found
> adding changesets
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files
> updating to branch default
> resolving manifests
> getting myfile
> 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> $ cd stable
> $ echo 'This is a fix to a boring feature.' > myfile
> $ hg commit -m 'Fix a bug'
> myfile
> committed changeset 1:01be9e1d0cf6
> $ cd ../main
> $ hg pull ../stable
> pulling from ../stable
> searching for changes
> 1 changesets found
> adding changesets
> adding manifests
> adding file changes
> added 1 changesets with 1 changes to 1 files (+1 heads)
> (run 'hg heads' to see heads, 'hg merge' to merge)
> $ hg merge
> resolving manifests
> couldn't find merge tool hgmerge
> merging myfile
> warning: conflicts during merge.
> merging myfile failed!
> 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
> use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
> $ exit
>
> Script done on Thu Jan 20 21:16:27 2011
>

-- 
arno  s  hautala    /-|   arno at alum.wpi.edu

pgp b2c9d448