Hi,

I am just starting to try out coda to see if it a more useful way of
sharing files between my laptop and desktop than my current method of
rsync-ing the trees.

However, I can not get any of the local modifications to be
reintegrated into the global tree.

I am using the .debs from your website which gives me

Coda Venus, version 5.3.20


If I do some work with the laptop off the network, when the network is
reconnected, there are conflicts as I would expect.

mark_at_mercury:~% cfs lv /coda/doc
  Status of volume 0x7f000001 (2130706433) named "codatitan-doc"
  Volume type is ReadWrite
  Connection State is WriteDisconnected
  Minimum quota is 0, maximum quota is unlimited
  Current blocks used are 10
  The partition has 208042 blocks available out of 270307
  Write-back is disabled
  *** There are pending conflicts in this volume ***
  There are 2 CML entries pending for reintegration

However when I try to repair, if I preserve any of the local
modifications, the repair command hangs:

mark_at_mercury:~% repair
This repair tool can be used to manually repair server/server
or local/global conflicts on files and directories.
You will first need to do a "beginrepair" to start a repair
session where messages about the nature of the conflict and
the commands that should be used to repair the conflict will
be displayed. Help message on individual commands can also be
obtained by using the "help" facility. Finally, you can use the
"endrepair" or "quit" to terminate the current repair session.
repair > beginrepair
Pathname of object in conflict? []: /coda/doc/mark
Local-global directory repair session started.
Available Commands:
        checklocal
        listlocal
        preservelocal
        preservealllocal
        discardlocal
        discardalllocal
        setglobalview
        setmixedview
        setlocalview
A list of local mutations is available in the .cml file in the coda spool directory
repair > preservealllocal
All 2 local mutation(s) redone in the global subtree

repair > endrepair
Commit the local-global repair session? [Y]: Y

*** Hang here *** I have waited for 1 hour and have to kill C^c

codacon on the client gives:

Local inconsistent object at /coda/doc/mark, please check! ( 11:20:30 )
reintegrate::codatitan-doc, 0/2 ( 11:20:30 )
connection::bandwidth titan.home.hindley.uklinux.net 14660 24731 79001 ( 11:20:34 )
GetVolStat codatitan-doc ( 11:21:04 )
connection::bandwidth titan.home.hindley.uklinux.net 15827 25961 72186 ( 11:21:09 )
GetVolStat codatitan-doc ( 11:21:28 )
connection::bandwidth titan.home.hindley.uklinux.net 17344 26400 55248 ( 11:21:33 )
BeginStatusWalk [9] ( 11:21:53 )
   [0, 0, 0, 0] [0] ( 11:21:53 )
NewConnectFS titan.home.hindley.uklinux.net ( 11:21:53 )
BackProbe titan.home.hindley.uklinux.net ( 11:21:53 )
connection::bandwidth titan.home.hindley.uklinux.net 24521 33773 54238 ( 11:21:53 )
EndStatusWalk [9] ( 11:21:53 )
   [0, 0, 0, 0] [0, 0, 0] [1, 0, 0.0] ( 11:21:53 )
BeginDataWalk [3] ( 11:21:53 )
EndDataWalk [3] ( 11:21:53 )
   [1, 0, 0.0] [0, 0, 0, 0] ( 11:21:53 )
Local inconsistent object at /coda/doc/mark, please check! ( 11:22:08 )
GetVolStat codatitan-doc ( 11:22:35 )
GetAttr global ( 11:22:35 )
GetVolStat codatitan-doc ( 11:22:35 )
Fetch global [2] ( 11:22:40 )
progress::fetching (global) 0x ( 11:22:40 )
progress::fetching (global) 100x ( 11:22:40 )
GetAttr (0x7f000001.0xd8.0x3e2) ( 11:22:40 )
connection::bandwidth titan.home.hindley.uklinux.net 29611 34095 40181 ( 11:22:45 )
Reintegrate codatitan-doc, (4, 180) ( 11:22:47 )
connection::bandwidth titan.home.hindley.uklinux.net 30301 34499 40048
( 11:22:52 )


What am I doing wrong here?

Thanks

Mark