Date: Tue, 24 Aug 2010 11:30:01 +0200 From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@des.no> To: Edwin Groothuis <edwin@mavetju.org> Cc: svn-src-stable@freebsd.org, Dimitry Andric <dimitry@andric.com>, 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 Message-ID: <86iq30pdd2.fsf@ds4.des.no> In-Reply-To: <20100824075117.GE2361@mavetju.org> (Edwin Groothuis's message of "Tue, 24 Aug 2010 17:51:17 %2B1000") References: <201008232209.o7NM9Q5l055003@svn.freebsd.org> <4C736D4F.6080003@andric.com> <20100824075117.GE2361@mavetju.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Edwin Groothuis <edwin@mavetju.org> writes: > Dimitry Andric <dimitry@andric.com> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86iq30pdd2.fsf>