problem: move --force with commit --non-recursive

[Gerco Ballintijn <Ge...@cwi.nl>]

I came across the following problem. On the one hand I like to to control
precisely what is committed, but on the other hand the client interface
only allows you to specify recursion on or off for all resources. I'm
therefore specifying all resources explicitly, but this unfortunately
fails when you first do a forced move and then a non-recursive commit.
The following script explains the scenario:

---------------------------------------------------------------------------
#! /bin/bash

set -x

# setting this up

R=file:///tmp/repo

rm -rf /tmp/repo /tmp/testing
svnadmin create /tmp/repo
svn mkdir -m "" $R/testing
svn checkout $R/testing /tmp/testing

pushd /tmp/testing/

mkdir -p my/pkg/src my/pkg/dst
echo "aap" > my/pkg/src/afile
svn add my
svn -m "" commit my

echo "noot" >> my/pkg/src/afile
svn move --force my/pkg/src my/pkg/dst/src

# fails on .../afile
svn commit -m "" -N my/pkg/dst/src my/pkg/dst/src/afile my/pkg/src

# doesn't commit .../afile
svn commit -m "" -N my/pkg/dst/src my/pkg/src
svn status -v my

popd

set +x
---------------------------------------------------------------------------

Is this a (known) bug? I need this to properly do a package-rename
refactoring in eclipse (subclipse currently does two separate commits).


G.C. Ballintijn
mailto:gerco@cwi.nl
http://homepages.cwi.nl/~gerco/



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

Re: problem: move --force with commit --non-recursive

[Ben Reser <be...@reser.org>]

On Fri, Apr 23, 2004 at 03:26:23PM +0200, Gerco Ballintijn wrote:
> I came across the following problem. On the one hand I like to to control
> precisely what is committed, but on the other hand the client interface
> only allows you to specify recursion on or off for all resources. I'm
> therefore specifying all resources explicitly, but this unfortunately
> fails when you first do a forced move and then a non-recursive commit.
> The following script explains the scenario:
> 
> ---------------------------------------------------------------------------
> #! /bin/bash
> 
> set -x
> 
> # setting this up
> 
> R=file:///tmp/repo
> 
> rm -rf /tmp/repo /tmp/testing
> svnadmin create /tmp/repo
> svn mkdir -m "" $R/testing
> svn checkout $R/testing /tmp/testing
> 
> pushd /tmp/testing/
> 
> mkdir -p my/pkg/src my/pkg/dst
> echo "aap" > my/pkg/src/afile
> svn add my
> svn -m "" commit my
> 
> echo "noot" >> my/pkg/src/afile
> svn move --force my/pkg/src my/pkg/dst/src
> 
> # fails on .../afile
> svn commit -m "" -N my/pkg/dst/src my/pkg/dst/src/afile my/pkg/src
> 
> # doesn't commit .../afile
> svn commit -m "" -N my/pkg/dst/src my/pkg/src
> svn status -v my
> 
> popd
> 
> set +x
> ---------------------------------------------------------------------------
> 
> Is this a (known) bug? I need this to properly do a package-rename
> refactoring in eclipse (subclipse currently does two separate commits).

It would have been helpful to include a transcript of the output...  How
does it fail?  I'll save this email and maybe get back to it and run
your setup and see what happens for myself...

-- 
Ben Reser <be...@reser.org>
http://ben.reser.org

"Conscience is the inner voice which warns us somebody may be looking."
- H.L. Mencken

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