erich at debian.org
Sat Sep 17 08:50:00 CDT 2005
> If there are no conflicts, the merge is automatic. There are smarter and less smart algorithms for it, of course.
There are cases where there will be conflicts, actually. E.g. I have a
default postfix configuration for regular servers (which resides in the
base layer), and a special one for the real mail servers (which resides
in the mail-server layer). I don't want to see any merge happen there
when I change the base version.
Servers that have only the base layer will be updated to the latest
version from base, servers that have the mail-server layer stick with
the version from there.
> You can't do without merging. Two people can always create incompatible changes and then you have to merge or discard one set of them.
> Tell me how to avoid it entirely.
Check out laysvn. ;-)
A very very simple rule:
if the file was modified in the branch, it is not to be merged.
That's why I called it layers: they *hide* what is underneath.
> IMO, the merge should always be done by the client.
Yes, that is why I want to avoid merges at all costs.
erich@(vitavonni.de|debian.org) -- GPG Key ID: 4B3A135C (o_
Go away or i'll replace you with a very small shell script. //\
Eine Stadt ist einem erst wirklich vertraut wenn man Freunde V_/_
in ihr hat. --- Antoine de Saint-Exupéry
More information about the Mercurial