Dealing with conflicts

of Kiss Coda Wiki

Identifying Conflicts

If you suspect a conflict because, for example, you can’t access a volume or an application is giving read or write errors, you can identify where the conflict(s) are by executing this command from a client:

    find /coda/realmname -noleaf -lname '@*'

Client/Server Conflicts

Also called Local/Global conflicts. See the documentation:

Server/Server Conflicts

See the documentation:

As mentioned in one of the above mailing list links, you can simplify the resolution of server-server conflicts with a script like this:

    find . -noleaf -lname '@*' | while read conf; do
        repair "$conf" /tmp/fix [-owner NNNN -mode 755]

It seems that the above script only handles directory conflicts. You should probably solve file conflicts by hand. However, in my setup, any server-server conflicts are probably bogus (at least, I’ve not yet seen a real one) so I wrote the following script, which may be useful to someone else. It assumes that you have two servers named server1 and server2 -Patrick 20:30, 8 Jul 2005 (CEST)

(note the script below is not exactly what Patrick wrote, with some problems fixed afterwards, but it needs more attention to be able to cope with possible control characters like ‘\n’ in file names and to avoid using the insecure temporary file names and especially the hardcoded “/tmp/fix”, it gives though a good idea of what is being done)

    find . -noleaf -lname '@*' | while read conf; do
           cfs beginrepair "$conf"
           file=`basename ./"$conf"`.$$
           sum1=`sha1sum ./"$conf"/"$server1" | cut -d" " -f1`
           sum2=`sha1sum ./"$conf"/"$server2" | cut -d" " -f1`
           if [ "$sum1" = "$sum2" ] ; then
                  cp ./"$conf"/"$server1" /tmp/"$file"
                  cfs endrepair "$conf"
                  echo beginrepair "$conf" > /tmp/fix
                  echo replaceinc >> /tmp/fix
                  echo /tmp/"$file" >> /tmp/fix
                  echo y >> /tmp/fix
                  echo endrepair >> /tmp/fix
                  cat /tmp/fix | repair
                  rm -f /tmp/"$file"

If you run into problems, see the Common error messages page.

At its former host this page has been accessed 4631 times.

Last modified: Thu Jun 26 07:36:54 UTC 2014