"Matthew R Welland" <mattwell_at_us.ibm.com> writes:

> Don't forget Linux gui users also!

I meant a gui built on gtk, for all unix-like systems.  I use
{Net,Free}BSD pretty much exclusively myself.

> I think the preservelocal/discardlocal mechanism can be confusing. Does the
> "local" refer to the client I am on? What if I am doing my repairs on my
> workstation but the file I want to keep is the one I updated on my laptop?
> Which one is local? I would want to be able to quickly view those files
> before choosing which to keep.

local is with respect to the venus you are running.  If you have a
local-global conflict you can only repair on the machine that had the
conflicting write, since it hasn't been integrated into the server.
But after doing 'beginrepair', the conflicting object turns into a
directory and then you can look in the files local and global
that appear in it to see the contents.

It might be that having the local version be at the normal name and
the global version be at some distinguished name would be convenient.
But this requires reserving parts of the file namespace to denote the
global files, which is un-unixy.

        Greg Troxel <gdt_at_ir.bbn.com>