You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Thomas Moschny <mo...@ipd.uni-karlsruhe.de> on 2004/01/21 14:59:23 UTC

Bug in svn cp (wc->url)

Hi,

We are using Subversion for a quite large project.
Recently we had some trouble with the svn 'cp' command: When copying from the 
working copy into the repository (to create a new branch, for example), it 
ignores the fact that some files were deleted in the working copy.

Here is a small bash script that shows the problem:

# create repository
svnadmin create repos
repos="file://"$(pwd)"/repos"
svn mkdir ${repos}/trunk -m 'trunk creation'

# checkout
svn co ${repos}/trunk work

# create a version
touch work/a work/b
svn add work/a work/b
svn commit work -m 'v1'

# check out this version again 
rm -rf work
svn co -r2 ${repos}/trunk work

# now change something
echo "modified" >> work/a
svn rm work/b

# and commit to a new branch
svn copy work ${repos}/v2 -m 'copy'

# checkout to another working dir
svn co ${repos}/v2 work2

# compare
diff -r --exclude .svn work work2

The documentation for svn cp reads: "WC  -> URL:  immediately commit a copy of 
WC to URL", so I would expect the diff output to be empty. However, with svn 
version 0.36.0, we get: "Only in work2: b", i.e. deletion of b was ignored, 
while the modification of a has made it into the v2 branch. 

If there's nothing I have overlooked, this seems to be a bug. 

Regards,
Thomas











---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Bug in svn cp (wc->url)

Posted by Thomas Moschny <mo...@ipd.uni-karlsruhe.de>.
On Wednesday 21 January 2004 10:01 pm, C. Michael Pilato wrote:
> "C. Michael Pilato" <cm...@collab.net> writes:
> > Yes.  I can reproduce the bug, and I know the cause.  I'll see if I
> > can bang out a fix real quick-like.
>
> Well, it wasn't quick-like, but hopefully the change I just committed
> to /trunk will work.

Seems to work now, thanks for the quick fix!

Regards,
Thomas


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Bug in svn cp (wc->url)

Posted by "C. Michael Pilato" <cm...@collab.net>.
"C. Michael Pilato" <cm...@collab.net> writes:

> Yes.  I can reproduce the bug, and I know the cause.  I'll see if I
> can bang out a fix real quick-like.

Well, it wasn't quick-like, but hopefully the change I just committed
to /trunk will work.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Bug in svn cp (wc->url)

Posted by "C. Michael Pilato" <cm...@collab.net>.
Thomas Moschny <mo...@ipd.uni-karlsruhe.de> writes:

> Hi,
> 
> We are using Subversion for a quite large project.  Recently we had
> some trouble with the svn 'cp' command: When copying from the
> working copy into the repository (to create a new branch, for
> example), it ignores the fact that some files were deleted in the
> working copy.

Yes.  I can reproduce the bug, and I know the cause.  I'll see if I
can bang out a fix real quick-like.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org