You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Nick <no...@codesniffer.com> on 2013/01/28 15:23:30 UTC

Missing file prevents submitting unrelated changelists

Removing a file which is scheduled to be added prevents submitting
unrelated changelists.

Occurring w/ my current version (1.7.7), have not tried others.

Annotated & unannotated repro steps follow.

$ svn --version
svn, version 1.7.7 (r1393599)
   compiled Jan  5 2013, 15:01:56


Unannotated repro steps:

	$ svn status
	$ touch a b c
	$ svn add a b c
	$ svn cl "Add a and b" a b
	$ rm c
	$ svn commit --cl "Add a and b"
	svn: E155010: Commit failed (details follow):
	svn: E155010: '/home/nick/test_repo/c' is scheduled for addition, but
is missing


Annotated repro steps:


Starting with a clean & up-to-date repo:

	$ svn status

Create and add 3 files to the repo:

	$ touch a b c
	$ svn add a b c
	A         a
	A         b
	A         c

Add 2 of the files (a & b) to a changelist:

	$ svn cl "Add a and b" a b
	A [Add a and b] a
	A [Add a and b] b

	$ svn status
	A       c
	
	--- Changelist 'Add a and b':
	A       a
	A       b

Remove file 'c' which is slated for addition, but not part of the
changelist:

	$ rm c

	$ svn status
	!       c
	
	--- Changelist 'Add a and b':
	A       a
	A       b

Attempt to commit the changelist:

	$ svn commit --cl "Add a and b"
	svn: E155010: Commit failed (details follow):
	svn: E155010: '/home/nick/test_repo/c' is scheduled for addition, but
is missing


This behavior is unexpected, since the removed file (c) is not in the
changelist being committed.


Nick



Re: Missing file prevents submitting unrelated changelists

Posted by Nick <no...@codesniffer.com>.
On Wed, 2013-02-06 at 00:36 +0100, Stefan Sperling wrote:
> I agree it's a bug. The state of items not in the changelist shouldn't
> affect commit of items in the changelist. Please file a bug so that
> someone will take a look at it eventually! Thanks :)
> Please don't forget to include a link to this thread in the issue (either
> in the 'URL' field of the issue or simply in a comment attached to the issue).

Thanks, done: http://subversion.tigris.org/issues/show_bug.cgi?id=4314



Re: Missing file prevents submitting unrelated changelists

Posted by Stefan Sperling <st...@elego.de>.
On Tue, Feb 05, 2013 at 06:23:10PM -0500, Nick wrote:
> On Mon, 2013-01-28 at 21:56 +0100, Johan Corveleyn wrote:
> > Sounds like a bug to me. This one is somewhat similar (though not the same):
> > 
> > http://subversion.tigris.org/issues/show_bug.cgi?id=3484 (Submitting a
> > changelist while obstructed item exists)
> 
> Right, similar in nature, but different in specifics.
> 
> Daniel:  Do you want to confirm before I open a bug?
> 
> Nick

I agree it's a bug. The state of items not in the changelist shouldn't
affect commit of items in the changelist. Please file a bug so that
someone will take a look at it eventually! Thanks :)
Please don't forget to include a link to this thread in the issue (either
in the 'URL' field of the issue or simply in a comment attached to the issue).

Re: Missing file prevents submitting unrelated changelists

Posted by Nick <no...@codesniffer.com>.
On Mon, 2013-01-28 at 21:56 +0100, Johan Corveleyn wrote:
> On Mon, Jan 28, 2013 at 5:31 PM, Nick <no...@codesniffer.com> wrote:
> > On Mon, 2013-01-28 at 18:03 +0200, Daniel Shahaf wrote:
> >> I see, perhaps I misread your initial script.  I wonder whether
> >> $ svn ci --cl "Add a and b" a b
> >> works...  (but no time to test right now :( )
> >
> > That works--files a and b are submitted despite file c missing.
> >
> > Should I open a bug on this now, or wait for one of the developers to
> > confirm it first?  I'm not in a rush, so whatever works best for the
> > devs.
> 
> Sounds like a bug to me. This one is somewhat similar (though not the same):
> 
> http://subversion.tigris.org/issues/show_bug.cgi?id=3484 (Submitting a
> changelist while obstructed item exists)

Right, similar in nature, but different in specifics.

Daniel:  Do you want to confirm before I open a bug?

Nick



Re: Missing file prevents submitting unrelated changelists

Posted by Johan Corveleyn <jc...@gmail.com>.
On Mon, Jan 28, 2013 at 5:31 PM, Nick <no...@codesniffer.com> wrote:
> On Mon, 2013-01-28 at 18:03 +0200, Daniel Shahaf wrote:
>> I see, perhaps I misread your initial script.  I wonder whether
>> $ svn ci --cl "Add a and b" a b
>> works...  (but no time to test right now :( )
>
> That works--files a and b are submitted despite file c missing.
>
> Should I open a bug on this now, or wait for one of the developers to
> confirm it first?  I'm not in a rush, so whatever works best for the
> devs.

Sounds like a bug to me. This one is somewhat similar (though not the same):

http://subversion.tigris.org/issues/show_bug.cgi?id=3484 (Submitting a
changelist while obstructed item exists)

-- 
Johan

Re: Missing file prevents submitting unrelated changelists

Posted by Nick <no...@codesniffer.com>.
On Mon, 2013-01-28 at 18:03 +0200, Daniel Shahaf wrote:
> I see, perhaps I misread your initial script.  I wonder whether
> $ svn ci --cl "Add a and b" a b
> works...  (but no time to test right now :( )

That works--files a and b are submitted despite file c missing.

Should I open a bug on this now, or wait for one of the developers to
confirm it first?  I'm not in a rush, so whatever works best for the
devs.



Re: Missing file prevents submitting unrelated changelists

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Nick wrote on Mon, Jan 28, 2013 at 11:00:10 -0500:
> 
> On Mon, 2013-01-28 at 16:54 +0200, Daniel Shahaf wrote:
> > By design.  You need 
> > $ svn rm c
> > or 
> > $ svn revert c
> 
> I don't understand why this is by design.  Regardless of what happens to
> the file 'c', I would not expect it to affect changelists which do not
> contain the file.
> 

I see, perhaps I misread your initial script.  I wonder whether
$ svn ci --cl "Add a and b" a b
works...  (but no time to test right now :( )

> This behavior seems very similar to Issue 3484:
> http://subversion.tigris.org/issues/show_bug.cgi?id=3484
> 
> In both cases a file *outside* the changelist is impacting the
> changelist.
> 
> 
> 
> > Nick wrote on Mon, Jan 28, 2013 at 09:23:30 -0500:
> > > Removing a file which is scheduled to be added prevents submitting
> > > unrelated changelists.
> > > 
> > > Occurring w/ my current version (1.7.7), have not tried others.
> > > 
> > > Annotated & unannotated repro steps follow.
> > > 
> > > $ svn --version
> > > svn, version 1.7.7 (r1393599)
> > >    compiled Jan  5 2013, 15:01:56
> > > 
> > > 
> > > Unannotated repro steps:
> > > 
> > > 	$ svn status
> > > 	$ touch a b c
> > > 	$ svn add a b c
> > > 	$ svn cl "Add a and b" a b
> > > 	$ rm c
> > > 	$ svn commit --cl "Add a and b"
> > > 	svn: E155010: Commit failed (details follow):
> > > 	svn: E155010: '/home/nick/test_repo/c' is scheduled for addition, but
> > > is missing
> 

Re: Missing file prevents submitting unrelated changelists

Posted by Nick <no...@codesniffer.com>.
On Mon, 2013-01-28 at 16:54 +0200, Daniel Shahaf wrote:
> By design.  You need 
> $ svn rm c
> or 
> $ svn revert c

I don't understand why this is by design.  Regardless of what happens to
the file 'c', I would not expect it to affect changelists which do not
contain the file.

This behavior seems very similar to Issue 3484:
http://subversion.tigris.org/issues/show_bug.cgi?id=3484

In both cases a file *outside* the changelist is impacting the
changelist.



> Nick wrote on Mon, Jan 28, 2013 at 09:23:30 -0500:
> > Removing a file which is scheduled to be added prevents submitting
> > unrelated changelists.
> > 
> > Occurring w/ my current version (1.7.7), have not tried others.
> > 
> > Annotated & unannotated repro steps follow.
> > 
> > $ svn --version
> > svn, version 1.7.7 (r1393599)
> >    compiled Jan  5 2013, 15:01:56
> > 
> > 
> > Unannotated repro steps:
> > 
> > 	$ svn status
> > 	$ touch a b c
> > 	$ svn add a b c
> > 	$ svn cl "Add a and b" a b
> > 	$ rm c
> > 	$ svn commit --cl "Add a and b"
> > 	svn: E155010: Commit failed (details follow):
> > 	svn: E155010: '/home/nick/test_repo/c' is scheduled for addition, but
> > is missing


Re: Missing file prevents submitting unrelated changelists

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
By design.  You need 
$ svn rm c
or 
$ svn revert c

Nick wrote on Mon, Jan 28, 2013 at 09:23:30 -0500:
> Removing a file which is scheduled to be added prevents submitting
> unrelated changelists.
> 
> Occurring w/ my current version (1.7.7), have not tried others.
> 
> Annotated & unannotated repro steps follow.
> 
> $ svn --version
> svn, version 1.7.7 (r1393599)
>    compiled Jan  5 2013, 15:01:56
> 
> 
> Unannotated repro steps:
> 
> 	$ svn status
> 	$ touch a b c
> 	$ svn add a b c
> 	$ svn cl "Add a and b" a b
> 	$ rm c
> 	$ svn commit --cl "Add a and b"
> 	svn: E155010: Commit failed (details follow):
> 	svn: E155010: '/home/nick/test_repo/c' is scheduled for addition, but
> is missing