tutorial problems

[scottbruin]

Matt Mackall wrote:
> 
> 
> Try merge --debug
> 
> 

An update with more info:

I tried this:
$ hg update -C 2
(...)
$ hg merge --debug
resolving manifests
 overwrite None partial False
 ancestor 82e55d328c8c local 4db0e80ae449+ remote d338c896a6f0
  searching for copies back to rev 2
  unmatched files in local:
   hello.c.orig
 hello.c: versions differ -> m
picked tool 'internal:merge' for hello.c (binary False symlink False)
merging hello.c
my hello.c at 4db0e80ae449+ other hello.c at d338c896a6f0 ancestor
hello.c at 0a04b987be5a
warning: conflicts during merge.
merging hello.c failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 2
  hg merge 3

Nothing happens, though. No tool comes up for resolving the conflict. I'm on
OS X Leopard, using stock Python and v1.01 from
http://mercurial.berkwood.com/.

Thanks again for any help; I don't know how to proceed without this step
working.
-- 
View this message in context: http://www.nabble.com/tutorial-problems-tp18080545p18116124.html
Sent from the Mercurial mailing list archive at Nabble.com.