From owner-freebsd-questions@FreeBSD.ORG  Mon Feb 24 19:45:44 2014
Return-Path: <owner-freebsd-questions@FreeBSD.ORG>
Delivered-To: freebsd-questions@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A3F7F740
 for <freebsd-questions@freebsd.org>; Mon, 24 Feb 2014 19:45:44 +0000 (UTC)
Received: from mail-ie0-x22d.google.com (mail-ie0-x22d.google.com
 [IPv6:2607:f8b0:4001:c03::22d])
 (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 709E31E59
 for <freebsd-questions@freebsd.org>; Mon, 24 Feb 2014 19:45:44 +0000 (UTC)
Received: by mail-ie0-f173.google.com with SMTP id lx4so3919264iec.32
 for <freebsd-questions@freebsd.org>; Mon, 24 Feb 2014 11:45:43 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc:content-type;
 bh=pVn5cwKrbZlqxcl9dmbLHjD9boCjihE/ad1AzqcAte0=;
 b=OPL4+qnBDRm9Xb5ycvyqzPb0yBiLflOKnVf1feRAx3Z1YFRKRz5F5iTBZqUxR6/Ikt
 PijS3IiRzsA+UK5zimPHD+VVZAeEcjprMVp8Q8UclOeNDkmGdUMXqlfIaXJTV11YUxUr
 6jFoc3rA7PE98jgRJa2uKm5Ga3/tKSfIhib/GRYWoA53Vo6rOkjzo7D/3UfUIML/ILRH
 f012eepEA8NJ0Sf4GD1veMQ4Xikjme5VyImyoonovtaSRzX0ZsZAILtmXxr04TEra+Er
 J/USpCfTThyi/hm65t7UWuJyEs8rUh7Oe5nYwZNBDsv2SnOsh9kizLrGlllZPWEnipeR
 iZKw==
MIME-Version: 1.0
X-Received: by 10.42.215.207 with SMTP id hf15mr16195277icb.17.1393271143471; 
 Mon, 24 Feb 2014 11:45:43 -0800 (PST)
Received: by 10.64.28.207 with HTTP; Mon, 24 Feb 2014 11:45:43 -0800 (PST)
In-Reply-To: <6D57A974-1235-461E-A164-DBFC798A8560@925.dk>
References: <6D57A974-1235-461E-A164-DBFC798A8560@925.dk>
Date: Mon, 24 Feb 2014 11:45:43 -0800
Message-ID: <CA+dWbmYo9XGp4xTeSSJjaRhbcKCGfHFmx33_raTH9=+DVU57ew@mail.gmail.com>
Subject: Re: freebsd-update auto merge fails on trivial VC lines
From: Patrick <gibblertron@gmail.com>
To: Martin Koch Andersen <martin@925.dk>
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.17
Cc: FreeBSD Questions Mailing List <freebsd-questions@freebsd.org>
X-BeenThere: freebsd-questions@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: User questions <freebsd-questions.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-questions/>
List-Post: <mailto:freebsd-questions@freebsd.org>
List-Help: <mailto:freebsd-questions-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-questions>, 
 <mailto:freebsd-questions-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Feb 2014 19:45:44 -0000

On Tue, Jan 10, 2012 at 5:36 AM, Martin Koch Andersen <martin@925.dk> wrote:

> Hello,
>
> When upgrading from FreeBSD 8.2-RELEASE to 9.0-RELEASE using
> freebsd-update, I'm asked to merge, what seems like, everything in /etc
> manually.
> And all of the merges are trivial version controls lines.
>
> E.g. my /etc/amd.map (which I never modified) begins with:
>
> # $FreeBSD: releng/8.2/etc/amd.map 164015 2006-11-06 01:42:11Z obrien $
>
> And this file (and line) freebsd-update asks me to manually merge. I
> wonder why that is.
>

I, too, have seen this happen a number of times, and it is most frustrating
and time-consuming. What's worse is when you accidentally accept a change
when a conflict line still exists, and you have to start the entire process
over again. Sure would be nice if it was smart enough to not fuss about
these version control lines.