From owner-freebsd-questions@FreeBSD.ORG Sun Sep 14 04:46:52 2003 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3C51116A4BF for ; Sun, 14 Sep 2003 04:46:52 -0700 (PDT) Received: from spam1.snu.ac.kr (spam2.snu.ac.kr [147.46.10.68]) by mx1.FreeBSD.org (Postfix) with SMTP id D787743FDD for ; Sun, 14 Sep 2003 04:46:50 -0700 (PDT) (envelope-from lahaye@snu.ac.kr) Received: (snipe 21813 invoked by alias); 14 Sep 2003 12:14:53 -0000 Received: from lahaye@snu.ac.kr with Spamsniper2.0 (Processed in 0.050316 secs); Received: from unknown (HELO sis1.snu.ac.kr) (147.46.10.36) by 0 with SMTP; 14 Sep 2003 12:14:53 -0000 X-RCPTTO: freebsd-questions@freebsd.org, Received: from snu.ac.kr ([147.46.44.183]) by sis1.snu.ac.kr (8.12.9/8.12.9) with ESMTP id h8EBk0SZ304476 for ; Sun, 14 Sep 2003 20:46:00 +0900 Message-ID: <3F64552C.7060900@snu.ac.kr> Date: Sun, 14 Sep 2003 20:46:52 +0900 From: Rob Lahaye Organization: Seoul National University - South Korea User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.4) Gecko/20030726 X-Accept-Language: en-us, ko-kr MIME-Version: 1.0 To: freebsd-questions@freebsd.org Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Subject: Q: mergemaster 'm'-merge option results in empty file X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Sep 2003 11:46:52 -0000 Hi, I'm trying to get grip of mergemaster. Either my logic is up-side-down or mergemaster is not so intuitive, but learning mergemaster seems a tough process for me. My problem now: # mergemaster -v This does some things, and then presents me a list of files that are only in my installed /etc directory. Ok, understand that. It then also takes me file by file to make a decision as: Use 'd' to delete the temporary ./etc/hosts Use 'i' to install the temporary ./etc/hosts Use 'm' to merge the temporary and installed versions Use 'v' to view the diff results again Using 'd' or 'i' works alright, but 'm' is totally uncomprehensive. E.g. I want to merge with my original /etc/hosts file, which has my own list of ips/hosts When typing 'm', I enter sdiff, which talks about a left and a right version, totally out-of-the-blue: %h l: use the left version r: use the right version e l: edit then use the left version e r: edit then use the right version e b: edit then use the left and right versions concatenated e: edit a new version s: silently include common lines v: verbosely include common lines q: quit What is left and right in the mergemaster context??? 'man sdiff' doesn't seem to help out here. I've tried a bit (I typed 'v' and 'q'), but then found /etc/hosts totally empty!! Any idea where I went wrong? Thanks, Rob.