problem in merge

[Matt Mackall]

On Wed, 2011-05-11 at 16:10 +0300, Omer Bacharach wrote:
> Hello,
> I have a problem in merging.
> Each time I try to merge a file which was changed by myself and by another
> source it fails claiming an orig file typt is not supported.
> The following snippet describes this scenario.
> in this scenario a file named id.bat could not be merge neither resolved.

Send the results with --debug, please.

> Your help will be much appreciated.
> Regards,
> Omer.
> 
> ---------------------------------------------------------------------------------------------------------------------------------------
> 
> C:\Hard Disk\Work\Toot\TootCode\Tootim>hg pull -u tootim.hg
> pulling from tootim.hg
> searching for changes
> adding changesets
> adding manifests
> adding file changes
> added 12 changesets with 37 changes to 17 files
> abort: crosses branches (use 'hg merge' or use 'hg update -c')
> 
> C:\Hard Disk\Work\Toot\TootCode\Tootim>hg merge
> merging to_id.bat
> *Unsupported file type C:\Hard Disk\Work\Toot\TootCode\Tootim\to_id.bat.orig
> *
> *merging to_id.bat failed!*
> merging tools/id_norm.py
> merging tools/pretrade.py
> 12 files updated, 2 files merged, 0 files removed, 1 files unresolved
> use 'hg resolve' to retry unresolved file merges or 'hg update -C' to
> abandon
> 
> C:\Hard Disk\Work\Toot\TootCode\Tootim>hg resolve to_id.bat
> merging to_id.bat
> *Unsupported file type C:\Hard Disk\Work\Toot\TootCode\Tootim\to_id.bat.orig
> *
> *merging to_id.bat failed!*
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial


-- 
Mathematics is the supreme nostalgia of our time.