On Mon, Aug 21, 2006 at 02:06:50AM +0200, Henning Sprang wrote:

> I don't understand that. This is about the way how you manage the
> xen-tools sources, right? I worked with CVS but no idea what placement
> of a directory in my software can lead to merge conflicts.

  Files in /etc/ are treated by dpkg as "conffiles".  If they differ
 between new installs and the current install you receive the message
 from apt-get/dpkg :

    "File differs what do you want to do?"
        "Keep old version"
        "Install new version"
        "show differences"

  Thats what I mean..

  Will consider your suggestion(s) later.

Steve
-- 

Reply via email to