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

Re: 301 error on merge

From: Ross Mark <rossm_at_controllingedge.com.au>
Date: 2003-12-15 02:27:50 CET

John Szakmeister wrote:

>Can you post a script that causes this error? I tried following what was
>listed in the mail yesterday and couldn't get it to fail. It would be useful
>in tracking this problem down and getting rid of it. :-)
>
>-John
>
>
I've attached a log for a complete session which shows the problem.

Ross

[rossm@rincewind svn]$ svn --version
svn, version 0.33.0 (r7737)
   compiled Nov 16 2003, 10:41:36

Copyright (C) 2000-2003 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/

The following repository access (RA) modules are available:

* ra_dav : Module for accessing a repository via WebDAV (DeltaV) protocol.
  - handles 'http' schema
  - handles 'https' schema
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' schema
* ra_svn : Module for accessing a repository using the svn network protocol.
  - handles 'svn' schema

[rossm_at_rincewind svn]$ svn co http://hercules/svn/ctrledge-repository/test
Authentication realm: <http://hercules:80> Subversion Repository test
Password for 'rossm':
 U test
Checked out revision 1.
[rossm@rincewind svn]$ cd test
[rossm@rincewind test]$ mkdir branches trunk
[rossm@rincewind test]$ svn add branches trunk
A branches
A trunk
[rossm@rincewind test]$ svn ci -m "base dirs" branches trunk
Adding branches
Adding trunk

Committed revision 2.
[rossm@rincewind test]$ cd trunk
[rossm@rincewind trunk]$ ls
[rossm@rincewind trunk]$ mkdir prodA
[rossm@rincewind trunk]$ cd prodA/
[rossm@rincewind prodA]$ echo 'main(){printf("Hello World\n");}' >prodA.c
[rossm@rincewind prodA]$ make prodA
cc prodA.c -o prodA
[rossm@rincewind prodA]$ ./prodA
Hello World
[rossm@rincewind prodA]$ cd ..
[rossm@rincewind trunk]$ svn add prodA/
A prodA
A prodA/prodA.c
A (bin) prodA/prodA
[rossm@rincewind trunk]$ svn ci -m "prodA first release"
Adding trunk/prodA
Adding (bin) trunk/prodA/prodA
Adding trunk/prodA/prodA.c
Transmitting file data ..
Committed revision 3.
[rossm_at_rincewind trunk]$ svn cp -m "branched dev1" http://hercules/svn/ctrledge-repository/test/trunk http://hercules/svn/ctrledge-repository/test/branches/dev1

Committed revision 4.
[rossm@rincewind trunk]$ cd ../branches/
[rossm@rincewind branches]$ svn update
A dev1
A dev1/prodA
A dev1/prodA/prodA
A dev1/prodA/prodA.c
Updated to revision 4.
[rossm@rincewind branches]$ cd dev1/prodA/
[rossm@rincewind prodA]$ echo 'main(){printf("Hello Cruel World\n");}' >prodA.c
[rossm@rincewind prodA]$ make prodA
cc prodA.c -o prodA
[rossm@rincewind prodA]$ ./prodA
Hello Cruel World
[rossm@rincewind prodA]$ cd ..
[rossm@rincewind dev1]$ svn ci -m "It is a cruel world"
Sending dev1/prodA/prodA
Sending dev1/prodA/prodA.c
Transmitting file data ..
Committed revision 5.
[rossm@rincewind dev1]$ cd ..
[rossm@rincewind branches]$ cd ../trunk/prodA
[rossm_at_rincewind prodA]$ svn merge -r 4:5 http://hercules/svn/ctrledge-repository/test/branches/dev1/prodA .
svn: RA layer request failed
svn: GET of /svn/ctrledge-repository/test/!svn/bc/4/branches/dev1/prodA: 301 Moved Permanently (http://hercules)
[rossm_at_rincewind prodA]$ svn merge -r 4:5 http://hercules/svn/ctrledge-repository/test/branches/dev1/prodA ../prodA
U ../prodA/prodA
U ../prodA/prodA.c

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 15 02:28:09 2003

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.