From owner-svn-src-stable@FreeBSD.ORG Tue Aug 24 09:47:50 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 64FDF1065696; Tue, 24 Aug 2010 09:47:50 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 2307F8FC21; Tue, 24 Aug 2010 09:47:49 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id D9C751FFC33; Tue, 24 Aug 2010 09:30:01 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id AA2AC845D1; Tue, 24 Aug 2010 11:30:01 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Edwin Groothuis References: <201008232209.o7NM9Q5l055003@svn.freebsd.org> <4C736D4F.6080003@andric.com> <20100824075117.GE2361@mavetju.org> Date: Tue, 24 Aug 2010 11:30:01 +0200 In-Reply-To: <20100824075117.GE2361@mavetju.org> (Edwin Groothuis's message of "Tue, 24 Aug 2010 17:51:17 +1000") Message-ID: <86iq30pdd2.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-stable@freebsd.org, Dimitry Andric , src-committers@freebsd.org, svn-src-stable-8@freebsd.org, svn-src-all@freebsd.org Subject: Re: svn commit: r211723 - in stable/8/usr.bin/calendar: . calendars calendars/ru_RU.KOI8-R X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Aug 2010 09:47:50 -0000 Edwin Groothuis writes: > Dimitry Andric writes: >> I think you forgot to add usr.bin/calendar/locale.c here? > I'm confused, shouldn't they be added automatically because of the > "svn merge"? It should, but this is a common mistake. What usually happens is that you do an svn merge, then figure out you did it wrong, revert it, and re-run it; but the new files are still there from the first attempt, so the second attempt will not overwrite them or record them as added. Everything looks and builds fine in your working copy, but the new files won't be committed. ISTR I actually wrote about this in the Subversion primer on the wiki. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no