svn commit: r211723 - in stable/8/usr.bin/calendar: . calendars
des at des.no
Tue Aug 24 09:30:03 UTC 2010
Edwin Groothuis <edwin at mavetju.org> writes:
> Dimitry Andric <dimitry at 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.
Dag-Erling Smørgrav - des at des.no
More information about the svn-src-all