From owner-svn-src-head@FreeBSD.ORG Fri Jan 2 06:58:45 2009 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EDBC1106566C; Fri, 2 Jan 2009 06:58:45 +0000 (UTC) (envelope-from kensmith@cse.Buffalo.EDU) Received: from phoebe.cse.buffalo.edu (phoebe.cse.buffalo.edu [128.205.32.89]) by mx1.freebsd.org (Postfix) with ESMTP id 8DB688FC16; Fri, 2 Jan 2009 06:58:45 +0000 (UTC) (envelope-from kensmith@cse.Buffalo.EDU) Received: from [192.168.1.101] (cpe-74-77-179-53.buffalo.res.rr.com [74.77.179.53]) (authenticated bits=0) by phoebe.cse.buffalo.edu (8.14.1/8.13.7) with ESMTP id n026wZtR037554 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 2 Jan 2009 01:58:38 -0500 (EST) (envelope-from kensmith@cse.buffalo.edu) From: Ken Smith To: Maxim Sobolev In-Reply-To: <495DB7DF.5020603@FreeBSD.org> References: <200901011055.n01AtQaN052763@svn.freebsd.org> <495DB7DF.5020603@FreeBSD.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="=-uwZY7u2atY9eD6ox4fQa" Date: Fri, 02 Jan 2009 01:58:29 -0500 Message-Id: <1230879509.12517.7.camel@neo.cse.buffalo.edu> Mime-Version: 1.0 X-Mailer: Evolution 2.22.3.1 FreeBSD GNOME Team Port X-DCC--Metrics: phoebe.cse.buffalo.edu 1336; Body=0 Fuz1=0 Fuz2=0 X-Spam-Status: No, score=1.7 required=5.0 tests=RCVD_IN_SORBS_DUL, RDNS_DYNAMIC autolearn=no version=3.2.3 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on phoebe.cse.buffalo.edu Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Doug Barton , src-committers@FreeBSD.org Subject: Re: svn: head/usr.sbin/mergemaster X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jan 2009 06:58:46 -0000 --=-uwZY7u2atY9eD6ox4fQa Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Thu, 2009-01-01 at 22:44 -0800, Maxim Sobolev wrote: > Doug Barton wrote: > > Given that this is a situation that comes up very infrequently (usual= ly > > only for a major version upgrade) and can usually be handled simply > > enough on a one-off basis, I will once again point out that I think > > this is a Bad Idea. I would be willing to consider a better implement= ation > > as an option that is off by default. >=20 > You are very wrong on this. This situation happens very *frequently*=20 > even for updates between minor releases (such as 6.3 to 6.4 and so on).=20 > As somebody doing lot of source upgrades frequently I can tell you this=20 > for sure. >=20 > -Maxim Just FWIW... What triggers it is creating a new branch tag. At the point we create a new releng/ in svn I need to have created the corresponding branch tag in the CVS repository first (e.g. RELENG_7_1 for releng/7.1). But then the svn2cvs exporter proceeds to check every file from releng/7.1 in to RELENG_7_1. So, you notice it the first time you try to upgrade into a new branch. Once you're in the branch updates get handled as you'd expect, just updating any of the files that have changed since the branch got created. And it doesn't happen with for example the tags that get created for the release (e.g. RELENG_7_1_0_RELEASE) which are "normal tags" as opposed to "branch tags". The exporter ignores the release/ tree in svn. --=20 Ken Smith - From there to here, from here to | kensmith@cse.buffalo.edu there, funny things are everywhere. | - Theodore Geisel | --=-uwZY7u2atY9eD6ox4fQa Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEABECAAYFAklduwgACgkQ/G14VSmup/ZGPACcCboMSiBA9/sNYd+A99UuhBbN ZXQAn2MYSkRuqpGOSsbKssaiDNRgwXfJ =xclF -----END PGP SIGNATURE----- --=-uwZY7u2atY9eD6ox4fQa--