Mac OS X 10.5.3: FileMerge.app not trying the merge as it should

Oscar Sanchez Casamitjana oscar.lists at mac.com
Tue Jun 24 16:12:23 CDT 2008


On Jun 24, 2008, at 8:52 PM, Matt Mackall wrote:

>
> On Tue, 2008-06-24 at 15:16 +0200, Oscar Sanchez Casamitjana wrote:
>> hi,
>>
>>
>> I'm on Mac OS X 10.5.3, with mercurial 1.0.1 installed via .pkg from
>> Lee Cantey (I have a problem with easy_installing, for which I will
>> open a thread later), and Apple's factory Python (2.5.1).
>>
>>
>> when I have a merge, FileMerge.app rightly opens, but instead of
>> showing the three way merge window it opens only the file chooser
>> dialog. I have an older system with the same setup, except that I
>> installed Mercurial with easy_install, and it does de merge operation
>> just right (opening the three way merge window in FileMerge.app,  
>> etc).
>>
>>
>> any clues on what can be wrong?
>
> Try running merge with the --debug switch.

thanks for helping Matt, here is the log:

hg merge --debug
resolving manifests
  overwrite None partial False
  ancestor 2517c70d71da local 5312b5e24133+ remote 884a6d4e4622
   searching for copies back to rev 405
   unmatched files in local:
    ramon
   unmatched files in other:
    src/html/examples/accions-globals-taules.html
    src/html/examples/accions-globals.html
    src/themes/default/img/icono-desplegable-simple-gran.gif
  src/html/components-accions-globals.html: versions differ -> m
  release: versions differ -> m
  src/html/components-enllacos.html: remote is newer -> g
  src/themes/default/css/components-ie.css: remote is newer -> g
  src/themes/default/css/components.css: remote is newer -> g
  src/js/others/TF7.init.js: remote is newer -> g
  src/html/examples/accions-globals-taules.html: remote created -> g
  src/themes/default/img/icono-desplegable-simple-gran.gif: remote  
created -> g
  src/html/examples/accions-globals.html: remote created -> g
picked tool '/Developer/Applications/Utilities/FileMerge.app/Contents/ 
MacOS/FileMerge' for release (binary False symlink False)
merging release
my release at 5312b5e24133+ other release at 884a6d4e4622 ancestor  
release at 2517c70d71da




oscar.


More information about the Mercurial mailing list