[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: strange issue with a merge

From: John Peacock <john.peacock_at_havurah-software.org>
Date: 2007-10-08 21:08:46 CEST

Craig White wrote:
> The error message is...
>
> Commit failed (details follow):
> '/home/storage/users/craig/svn/th-db/trunk/vendor/plugins/flextimes/doc/classes/FlexTimes/HelperMethods.src' is not under version control and is not part of the commit, yet its child '/home/storage/users/craig/svn/th-db/trunk/vendor/plugins/flextimes/doc/classes/FlexTimes/HelperMethods.src/M000012.html' is part of the commit
>
> everything under
> the /home/storage/users/craig/svn/th-db/trunk/vendor/plugins/flextimes/
> tree was added in commit #171

cd up to a higher directory (i.e. above the directory that was
complaining) and update. I've seen that behavior when I added something
and the parent directory hadn't been updated yet (so it didn't know I
had added anything). You may need to commit from the higher level as
well, I forget the exact sequence I used to get around this...

HTH

John

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Oct 8 21:10:20 2007

This is an archived mail posted to the Subversion Users mailing list.