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

unable to merge after update

From: SD HILL <sdh_at_sdhill.com>
Date: Wed, 11 Feb 2009 14:18:49 -0600

Last weekend I migrated our subversion repository to a new server (Ubuntu
8.10) and upgraded subversion to 1.5 from 1.4. Today I have been trying to
merge some code changes from a release branch to trunk and am running into
problems. I run two separate svn repositories and the root of each
repository contains subprojects
root1
   root1/proj1
   root1/proj2
root2
  ....

Only project leads have permissions to the roots, all other permissions are
on the subprojects.

First there were some new files created in the release branch. I copied them
to my working copy and then committed them to trunk. I got a 403 Forbidden
on a PROPFIND on the repository root. I have rw permission on the root. Even
with the errors the files are committed.

Second is that I was trying to merge some file changes from the branch to
the trunk. If I do something like...
     svn merge --dry-run -r348:HEAD
http://myhost/repos/root1/proj1/branches/release1/ .

to mege the changes to my working copy svn returns with nothing. I know that
there changes have been made, and can see the changes by doing an svn diff
on the files. If I try to do a URL to URL merge, with a dry run, svn comes
back that it wants to add all of the files, even though the existing in the
destination URL.

In watching my log files while trying to do the merge to my working copy I
see the following in my apache logs. I tried this from the server to try and
eliminate as many variables as possible.

==> access.log <==
127.0.0.1 - - [11/Feb/2009:13:19:42 -0600] "OPTIONS
/repos/tde/tods/branches/sp1
.5_uat_1/Code HTTP/1.1" 200 - "-" "SVN/1.5.1 (r32289) neon/0.28.2"
127.0.0.1 - - [11/Feb/2009:13:19:42 -0600] "PROPFIND
/repos/tde/tods/branches/sp
1.5_uat_1/Code HTTP/1.1" 207 370 "-" "SVN/1.5.1 (r32289) neon/0.28.2"
127.0.0.1 - - [11/Feb/2009:13:19:42 -0600] "PROPFIND
/repos/tde/!svn/vcc/default
 HTTP/1.1" 207 246 "-" "SVN/1.5.1 (r32289) neon/0.28.2"
127.0.0.1 - - [11/Feb/2009:13:19:42 -0600] "PROPFIND /repos/tde/!svn/bln/353
HTT
P/1.1" 207 260 "-" "SVN/1.5.1 (r32289) neon/0.28.2"
127.0.0.1 - - [11/Feb/2009:13:19:42 -0600] "PROPFIND
/repos/tde/tods/branches/sp
1.5_uat_1/Code HTTP/1.1" 207 370 "-" "SVN/1.5.1 (r32289) neon/0.28.2"
127.0.0.1 - - [11/Feb/2009:13:19:42 -0600] "PROPFIND
/repos/tde/!svn/vcc/default
 HTTP/1.1" 207 246 "-" "SVN/1.5.1 (r32289) neon/0.28.2"
127.0.0.1 - - [11/Feb/2009:13:19:42 -0600] "PROPFIND /repos/tde/!svn/bln/353
HTT
P/1.1" 207 260 "-" "SVN/1.5.1 (r32289) neon/0.28.2"
127.0.0.1 - - [11/Feb/2009:13:19:42 -0600] "PROPFIND
/repos/tde/tods/branches/sp
1.5_uat_1/Code HTTP/1.1" 207 370 "-" "SVN/1.5.1 (r32289) neon/0.28.2"
127.0.0.1 - - [11/Feb/2009:13:19:42 -0600] "PROPFIND
/repos/tde/!svn/vcc/default
 HTTP/1.1" 207 260 "-" "SVN/1.5.1 (r32289) neon/0.28.2"
127.0.0.1 - - [11/Feb/2009:13:19:42 -0600] "REPORT
/repos/tde/!svn/bc/353/tods/b
ranches/sp1.5_uat_1/Code HTTP/1.1" 200 125 "-" "SVN/1.5.1 (r32289)
neon/0.28.2"

==> error.log <==
[Wed Feb 11 13:19:42 2009] [error] [client 127.0.0.1] Access denied: - GET
tde:/
branches/sp1.5_uat_1/Code

One thing I noticed is that the access log does not have my username, this
is the case even if I use the username and password options.

I've tried everything I can think of and would appreciate any input.

Thanks -- Steve

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1140618

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-11 21:20:04 CET

This is an archived mail posted to the Subversion Users mailing list.