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

Re: Can't commit "out of date" file, but "svn update" won't fix it

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Tue, 07 Oct 2008 23:55:11 -0400

Steve Strobel <steve.strobel_at_link-comm.com> writes:
> svn status linux-2.6.x/sound/blackfin/Makefile
> A + linux-2.6.x/sound/blackfin/Makefile

This means your file is locally added (with history -- i.e., a copy).

When you 'update' that, the repository knows nothing about it, since the
repository doesn't have the add yet. But when you try to commit it,
it's bumping into something -- something that's already there.

Show us 'svn log -v svn://192.168.25.29/, or
'svn info svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile'.

(By the way, your repository has no name? It looks like you're just
serving it from the root of the svn:// namespace, which is unusual.)

-Karl

> svn info linux-2.6.x/sound/blackfin/Makefile
> Path: linux-2.6.x/sound/blackfin/Makefile
> Name: Makefile
> URL: svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile
> Repository Root: svn://192.168.25.29
> Revision: 375
> Node Kind: file
> Schedule: add
> Copied From URL: svn://192.168.25.29/trunk/linux-2.6.x/sound/blackfin/Makefile
> Copied From Rev: 232
> Last Changed Rev: 106
> Last Changed Date: 2007-10-09 10:07:20 -0600 (Tue, 09 Oct 2007)
> Text Last Updated: 2008-10-07 16:28:10 -0600 (Tue, 07 Oct 2008)
> Checksum: aa91698b7411c2a60089a45573005f65
>
> What am I doing wrong?
>
> Steve
>
>
>
> ---
> Steve Strobel
> Link Communications, Inc.
> 1035 Cerise Rd
> Billings, MT 59101-7378
> (406) 245-5002 ext 102
> (406) 245-4889 (fax)
> WWW: http://www.link-comm.com
> MailTo:steve.strobel_at_link-comm.com
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
> For additional commands, e-mail: users-help_at_subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-08 05:55:39 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.