Date: Fri, 02 Jan 2009 01:58:29 -0500 From: Ken Smith <kensmith@cse.Buffalo.EDU> To: Maxim Sobolev <sobomax@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Doug Barton <dougb@FreeBSD.org>, src-committers@FreeBSD.org Subject: Re: svn: head/usr.sbin/mergemaster Message-ID: <1230879509.12517.7.camel@neo.cse.buffalo.edu> In-Reply-To: <495DB7DF.5020603@FreeBSD.org> References: <200901011055.n01AtQaN052763@svn.freebsd.org> <495DB7DF.5020603@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-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/<something> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1230879509.12517.7.camel>