You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Steve Strobel <st...@link-comm.com> on 2008/10/07 23:05:46 UTC
Can't commit "out of date" file, but "svn update" won't fix it
There is a file that I can't commit because it is supposedly
"out of date", even if I update it immediately before that:
svn update linux-2.6.x/sound/blackfin/Makefile
At revision 375.
svn commit linux-2.6.x/sound/blackfin/Makefile -m "Comment"
Adding linux-2.6.x/sound/blackfin/Makefile
svn: Commit failed (details follow):
svn: Out of date: '/trunk/linux-2.6.x/sound/blackfin/Makefile' in transaction '375-1'
I don't see how it can be out of date if I just updated it.
More info about that file:
svn status linux-2.6.x/sound/blackfin/Makefile
A + linux-2.6.x/sound/blackfin/Makefile
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@link-comm.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Can't commit "out of date" file, but "svn update" won't fix it
Posted by Karl Fogel <kf...@red-bean.com>.
Steve Strobel <st...@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@link-comm.com
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org