I did the following:
- create a branch
- check out the branch
- add some new files (and modify some) to the branch
- try to merge the changes on the branch into my trunk working copy.
I got the following error on merge:
svn: RA layer request failed
svn: PROPFIND of https://host/svn/conductor/branches/release-0.77/conductor-base/src/web/resources/glossary/entries/mathematics/Perpendicular Lines.entry: 404 Not Found
I can 'svn cat' the path given in the above error message just fine.
I can also browse the path in Internet Explorer.
(Trying to merge just that specific file results in the same error, except
on REPORT instead of PROPFIND.)
The Apache "error_log" contains nothing about the error.
My subversion server is svn version 0.22-dev (svn head as of late april
or early may), on FreeBSD, using BDB 4.0.14, with httpd from CVS HEAD as
of 4/30/03. My client is 0.21.0 on Windows.
More detail (and output) follows.
Known issue? Suggestions? More information needed?
-brian
# MAKE A BRANCH
$ svn mkdir https://host/svn/conductor/branches/release-0.77
$ svn cp https://host/svn/conductor/trunk/conductor-base \
https://host/svn/conductor/branches/release-0.77/conductor-base
# CHECK OUT THE BRANCH
$ mkdir /path/to/src_077
$ cd /path/to/src_077
$ svn co https://host/svn/conductor/branches/release-0.77/conductor-base
# ADD SOME NEW FILES TO THE BRANCH
$ cp [a bunch of non-controlled files] \
[their correct places in the working copy]
$ cd conductor-base/src/web
$ svn ci
Adding (bin) web/homework/images/288a.gif
Adding (bin) web/homework/images/288b.gif
Adding (bin) web/homework/images/288d.gif
Adding (bin) web/homework/images/289_segment.gif
Adding (bin) web/homework/images/295_segment.gif
Adding (bin) web/homework/images/296_a.gif
Adding (bin) web/homework/images/296_b.gif
Adding (bin) web/homework/images/296_c.gif
Adding (bin) web/homework/images/296_d.gif
Adding (bin) web/homework/images/315_segment.gif
Adding (bin) web/homework/images/317_angles.gif
Adding (bin) web/homework/images/318_angles.gif
Adding (bin) web/homework/images/319_angles.gif
Adding (bin) web/homework/images/321_angles.gif
Adding (bin) web/homework/images/325_angles.gif
Adding (bin) web/homework/images/327_quad.gif
Adding (bin) web/homework/images/328_octagon.gif
Adding (bin) web/homework/images/338_angles.gif
Adding (bin) web/homework/images/339_angles.gif
Adding (bin) web/homework/images/340_rays.gif
Adding (bin) web/homework/images/341_triangle.gif
Adding (bin) web/homework/images/342_angles.gif
Adding (bin) web/homework/images/poly1.gif
Adding (bin) web/homework/images/poly2.gif
Adding (bin) web/homework/images/poly3.gif
Adding (bin) web/homework/images/rational1.gif
Adding (bin) web/homework/images/rational2.gif
Adding (bin) web/homework/images/rational3.gif
Adding (bin) web/homework/images/triangle1.gif
Adding (bin) web/homework/images/triangle2.gif
Adding (bin) web/homework/images/triangle3.gif
Adding (bin) web/homework/images/xy_table1.gif
Adding (bin) web/homework/images/xy_table2.gif
Adding web/resources/glossary/entries/mathematics/Acute Angle.entry
Adding web/resources/glossary/entries/mathematics/Alternate Exterior Angles.entry
Adding web/resources/glossary/entries/mathematics/Alternate Interior Angles.entry
Adding web/resources/glossary/entries/mathematics/Angle.entry
Adding web/resources/glossary/entries/mathematics/Asymptote.entry
Sending web/resources/glossary/entries/mathematics/Axis of Symmetry.entry
Sending web/resources/glossary/entries/mathematics/Column Percent.entry
Sending web/resources/glossary/entries/mathematics/Commutative Property.entry
Adding web/resources/glossary/entries/mathematics/Complementary Angles.entry
Adding web/resources/glossary/entries/mathematics/Constant.entry
Adding web/resources/glossary/entries/mathematics/Coordinate.entry
Adding web/resources/glossary/entries/mathematics/Corresponding Angles.entry
Adding web/resources/glossary/entries/mathematics/Degree of a Polynomial.entry
Adding web/resources/glossary/entries/mathematics/Degree.entry
Sending web/resources/glossary/entries/mathematics/Elimination Method.entry
Sending web/resources/glossary/entries/mathematics/Equation.entry
Adding web/resources/glossary/entries/mathematics/Equilateral Triangle.entry
Adding web/resources/glossary/entries/mathematics/Exponent.entry
Adding web/resources/glossary/entries/mathematics/Exterior Angle of a Polygon.entry
Sending web/resources/glossary/entries/mathematics/Extrapolation.entry
Sending web/resources/glossary/entries/mathematics/Factored Form.entry
Sending web/resources/glossary/entries/mathematics/Feasible Region.entry
Sending web/resources/glossary/entries/mathematics/Function.entry
Sending web/resources/glossary/entries/mathematics/Inequality.entry
Sending web/resources/glossary/entries/mathematics/Intercept.entry
Sending web/resources/glossary/entries/mathematics/Interpolation.entry
Sending web/resources/glossary/entries/mathematics/Interquartile Range.entry
Sending web/resources/glossary/entries/mathematics/Inverse.entry
Sending web/resources/glossary/entries/mathematics/Invertible.entry
Adding web/resources/glossary/entries/mathematics/Isosceles Triangle.entry
Adding web/resources/glossary/entries/mathematics/Line Segment.entry
Adding web/resources/glossary/entries/mathematics/Line.entry
Sending web/resources/glossary/entries/mathematics/Linear Relationship.entry
Sending web/resources/glossary/entries/mathematics/Linear.entry
Adding web/resources/glossary/entries/mathematics/Midpoint.entry
Adding web/resources/glossary/entries/mathematics/Nonlinear Relationship.entry
Adding web/resources/glossary/entries/mathematics/Obtuse Angle.entry
Adding web/resources/glossary/entries/mathematics/Ordered Pair.entry
Sending web/resources/glossary/entries/mathematics/Parabola.entry
Adding web/resources/glossary/entries/mathematics/Parallel Lines.entry
Adding web/resources/glossary/entries/mathematics/Perpendicular Lines.entry
Adding web/resources/glossary/entries/mathematics/Plane.entry
Adding web/resources/glossary/entries/mathematics/Point.entry
Adding web/resources/glossary/entries/mathematics/Polygon.entry
Adding web/resources/glossary/entries/mathematics/Polynomial Function.entry
Sending web/resources/glossary/entries/mathematics/Power of a Quotient Property.entry
Sending web/resources/glossary/entries/mathematics/Quadratic Equation.entry
Sending web/resources/glossary/entries/mathematics/Quadratic Formula.entry
Adding web/resources/glossary/entries/mathematics/Quadrilateral.entry
Sending web/resources/glossary/entries/mathematics/Quotient of Powers Property.entry
Adding web/resources/glossary/entries/mathematics/Range of the Data.entry
Sending web/resources/glossary/entries/mathematics/Range.entry
Adding web/resources/glossary/entries/mathematics/Rational Function.entry
Adding web/resources/glossary/entries/mathematics/Ray.entry
Adding web/resources/glossary/entries/mathematics/Right Angle.entry
Sending web/resources/glossary/entries/mathematics/Root.entry
Adding web/resources/glossary/entries/mathematics/Scalene Triangle.entry
Sending web/resources/glossary/entries/mathematics/Scatterplot - Form.entry
Sending web/resources/glossary/entries/mathematics/Slope.entry
Sending web/resources/glossary/entries/mathematics/Solution Set.entry
Adding web/resources/glossary/entries/mathematics/Solution.entry
Sending web/resources/glossary/entries/mathematics/Standard Form.entry
Adding web/resources/glossary/entries/mathematics/Straight Angle.entry
Sending web/resources/glossary/entries/mathematics/Substitution Method.entry
Adding web/resources/glossary/entries/mathematics/Supplementary Angles.entry
Sending web/resources/glossary/entries/mathematics/System of Equations.entry
Sending web/resources/glossary/entries/mathematics/System of Inequalities.entry
Sending web/resources/glossary/entries/mathematics/Term.entry
Adding web/resources/glossary/entries/mathematics/Transversal.entry
Adding web/resources/glossary/entries/mathematics/Triangle.entry
Sending web/resources/glossary/entries/mathematics/Variable Expression.entry
Sending web/resources/glossary/entries/mathematics/Variable.entry
Sending web/resources/glossary/entries/mathematics/Vertex Form.entry
Adding web/resources/glossary/entries/mathematics/Vertex of a Parabola.entry
Sending web/resources/glossary/entries/mathematics/Vertex.entry
Adding web/resources/glossary/entries/mathematics/Vertical Angles.entry
Sending web/resources/glossary/entries/mathematics/x-intercept.entry
Adding (bin) web/resources/glossary/graphics/angle.bmp
Adding (bin) web/resources/glossary/graphics/angle.gif
Adding (bin) web/resources/glossary/graphics/angles.gif
Adding (bin) web/resources/glossary/graphics/asymptotes.gif
Adding (bin) web/resources/glossary/graphics/comp.gif
Adding (bin) web/resources/glossary/graphics/equilateral.gif
Adding (bin) web/resources/glossary/graphics/exterior.gif
Adding (bin) web/resources/glossary/graphics/hexagon.gif
Adding (bin) web/resources/glossary/graphics/isosceles.gif
Adding (bin) web/resources/glossary/graphics/line.bmp
Adding (bin) web/resources/glossary/graphics/line.gif
Adding (bin) web/resources/glossary/graphics/midpoint.bmp
Adding (bin) web/resources/glossary/graphics/midpoint.gif
Adding (bin) web/resources/glossary/graphics/obtuse.bmp
Adding (bin) web/resources/glossary/graphics/obtuse.gif
Adding (bin) web/resources/glossary/graphics/parallel.gif
Adding (bin) web/resources/glossary/graphics/perpendicular.gif
Adding (bin) web/resources/glossary/graphics/plane.bmp
Adding (bin) web/resources/glossary/graphics/plane.gif
Adding (bin) web/resources/glossary/graphics/plane2.bmp
Adding (bin) web/resources/glossary/graphics/plane2.gif
Adding (bin) web/resources/glossary/graphics/point.bmp
Adding (bin) web/resources/glossary/graphics/point.gif
Adding (bin) web/resources/glossary/graphics/polynomial.gif
Adding (bin) web/resources/glossary/graphics/quads.gif
Adding (bin) web/resources/glossary/graphics/rational.gif
Adding (bin) web/resources/glossary/graphics/ray.gif
Adding (bin) web/resources/glossary/graphics/ray1.bmp
Adding (bin) web/resources/glossary/graphics/ray1.gif
Adding (bin) web/resources/glossary/graphics/ray2.bmp
Adding (bin) web/resources/glossary/graphics/ray2.gif
Adding (bin) web/resources/glossary/graphics/right.bmp
Adding (bin) web/resources/glossary/graphics/right.gif
Adding (bin) web/resources/glossary/graphics/scalene.gif
Adding (bin) web/resources/glossary/graphics/segment.bmp
Adding (bin) web/resources/glossary/graphics/segment.gif
Adding (bin) web/resources/glossary/graphics/straight.bmp
Adding (bin) web/resources/glossary/graphics/straight.gif
Adding (bin) web/resources/glossary/graphics/supp.gif
Adding (bin) web/resources/glossary/graphics/transversal.gif
Adding (bin) web/resources/glossary/graphics/vertical.gif
Adding (bin) web/resources/glossary/graphics/xintercepts.gif
Transmitting file data
.............................................................................
...........................................................................
Committed revision 144.
# MERGE THE ADDITIONS TO THE BRANCH INTO THE TRUNK
$ cd /path/to/trunk/conductor-base/src/web
$ svn merge -r143:144 https://host/svn/conductor/branches/release-0.77/conductor-base/src/web .
A homework/images/xy_table1.gif
A homework/images/rational2.gif
A homework/images/296_a.gif
A homework/images/296_c.gif
A homework/images/328_octagon.gif
A homework/images/341_triangle.gif
A homework/images/342_angles.gif
A homework/images/poly2.gif
A homework/images/288b.gif
A homework/images/288d.gif
A homework/images/325_angles.gif
A homework/images/289_segment.gif
A homework/images/319_angles.gif
A homework/images/339_angles.gif
A homework/images/triangle2.gif
A homework/images/xy_table2.gif
A homework/images/rational1.gif
A homework/images/rational3.gif
A homework/images/317_angles.gif
A homework/images/296_b.gif
A homework/images/296_d.gif
A homework/images/315_segment.gif
A homework/images/poly1.gif
A homework/images/poly3.gif
A homework/images/288a.gif
A homework/images/321_angles.gif
A homework/images/327_quad.gif
A homework/images/triangle1.gif
A homework/images/triangle3.gif
A homework/images/295_segment.gif
A homework/images/318_angles.gif
A homework/images/340_rays.gif
A homework/images/338_angles.gif
A resources/glossary/graphics/segment.bmp
A resources/glossary/graphics/polynomial.gif
A resources/glossary/graphics/right.bmp
A resources/glossary/graphics/angle.gif
A resources/glossary/graphics/hexagon.gif
A resources/glossary/graphics/isosceles.gif
A resources/glossary/graphics/plane2.bmp
A resources/glossary/graphics/plane.gif
A resources/glossary/graphics/obtuse.gif
A resources/glossary/graphics/point.bmp
A resources/glossary/graphics/rational.gif
A resources/glossary/graphics/ray1.gif
A resources/glossary/graphics/ray2.gif
A resources/glossary/graphics/midpoint.gif
A resources/glossary/graphics/supp.gif
A resources/glossary/graphics/line.gif
A resources/glossary/graphics/perpendicular.gif
A resources/glossary/graphics/straight.bmp
A resources/glossary/graphics/comp.gif
A resources/glossary/graphics/exterior.gif
A resources/glossary/graphics/segment.gif
A resources/glossary/graphics/xintercepts.gif
A resources/glossary/graphics/right.gif
A resources/glossary/graphics/quads.gif
A resources/glossary/graphics/plane2.gif
A resources/glossary/graphics/point.gif
A resources/glossary/graphics/angle.bmp
A resources/glossary/graphics/transversal.gif
A resources/glossary/graphics/plane.bmp
A resources/glossary/graphics/asymptotes.gif
A resources/glossary/graphics/vertical.gif
A resources/glossary/graphics/angles.gif
A resources/glossary/graphics/obtuse.bmp
A resources/glossary/graphics/ray1.bmp
A resources/glossary/graphics/straight.gif
A resources/glossary/graphics/ray2.bmp
A resources/glossary/graphics/ray.gif
A resources/glossary/graphics/midpoint.bmp
A resources/glossary/graphics/parallel.gif
A resources/glossary/graphics/line.bmp
A resources/glossary/graphics/equilateral.gif
A resources/glossary/graphics/scalene.gif
U resources/glossary/entries/mathematics/System of Inequalities.entry
svn: RA layer request failed
svn: PROPFIND of https://host/svn/conductor/branches/release-0.77/conductor-base/src/web/resources/glossary/entries/mathematics/Perpendicular Lines.entry: 404 Not Found
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jun 13 02:45:07 2003