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

Re: Submitting a changelist while obstructed item exists

From: Rob van Oostrum <rvanoo_at_gmail.com>
Date: Thu, 13 Aug 2009 12:23:11 -0400

On Thu, Aug 13, 2009 at 12:34 AM, Nick <nospam_at_codesniffer.com> wrote:

> It seems I can't submit a changelist while a file is marked as
> obstructed, even though the obstructed file is not in the changelist.
>
> Here's an example. Files '1' and '2' are modified, and both are in a
> changelist named 'CL1'. The file '3' is obstructed, and it is not in a
> changelist.
>
>
> nick_at_nimble ~/test_repo $ svn status
> M 1
> M 2
> ~ 3
>
> nick_at_nimble ~/test_repo $ svn cl CL1 1 2
> Path '1' is now a member of changelist 'CL1'.
> Path '2' is now a member of changelist 'CL1'.
>
> nick_at_nimble ~/test_repo $ svn status
> ~ 3
>
> --- Changelist 'CL1':
> M 1
> M 2
>
> nick_at_nimble ~/test_repo $ svn ci --cl CL1
> svn: Commit failed (details follow):
> svn: Entry '/home/nick/test_repo/3' has unexpectedly changed special
> status
>
>
> I would expect svn to only attempt committing the contents of the
> changelist, which in this example is the files '1' and '2'. But it
> seems the existence of an obstructed file prevents the commit, even
> though the obstructed file is not in the changelist and is not specified
> to be included in the commit.
>
> Is this by design?
>
> Best regards,
> Nick
>
> ------------------------------------------------------
>
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2383127
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_subversion.tigris.org].
>

You're right that should work, it does for me anyway:
$ svnadmin create cltest
$ svn co file:///Users/rob/cltest cltest-wc
Checked out revision 0.
$ cd cltest-wc/
$ touch a
$ touch b
$ touch c
$ svn add a b c
A a
A b
A c
$ svn ci -m "add a, b and c"
Adding a
Adding b
Adding c
Transmitting file data ...
Committed revision 1.
$ rm c
$ mkdir c
$ svn st
~ c
$ vi a
$ vi b
$ svn st
M a
M b
~ c
$ svn cl CL1 a b
Path 'a' is now a member of changelist 'CL1'.
Path 'b' is now a member of changelist 'CL1'.
$ svn st
~ c

--- Changelist 'CL1':
M a
M b
$ svn ci --cl CL1 -m "test"
Sending a
Sending b
Transmitting file data ..
Committed revision 2.
$ svn st
~ c

What caused the obstruction in your case? Can you reproduce the problem in
your environment using my scenario? Which OS are you on? What version of
SVN?

Cheers
Rob

-- 
Polarion Software
Subversion Training & Consulting Services |
www.polarion.com/services/index.php
Download Eclipse bundled with Subversive  today! |
www.polarion.com/products/eclipse/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2383347
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-08-13 18:24:17 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.