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

[PATCH] Fix `svn merge' involving revision range and urls

From: Kannan <kannanr_at_collab.net>
Date: Wed, 04 Nov 2009 21:09:53 +0530

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Current dev-trunk seems to be broken with `svn merge' involving range of
revisions between a url and working copy, especially cases such as `svn
merge -rBASE:HEAD ^/branches', `svn merge -rPREV:COMMITTED ^/branches'
involving the keywords 'svn_opt_revision_base',
'svn_opt_revision_previous', 'svn_opt_revision_committed' when given in
revision range, but works fine when the range of revisions are specified
as numerals. In general, when there is a url argument to `svn merge',
both working copy path and the source url get appended as local absolute
path(eg. /home/kannan/wc/http:/localhost/repo/branches) in 'client'
layer which when passed to further methods finds it as unversioned, thus
causing the breakage. The following patch fixes the above case.

Log:
When `svn merge' receives source as a url, get it's relative part from
the source root url and form a valid, versioned local absolute path.

* subversion/libsvn_client/merge.c
 (normalize_merge_sources): If the source provided is a url, get its
  relative part from the 'source_root_url' and form the local absolute
  path.

Patch by: Kannan R <kannanr_at_collab.net>

- --
Regards,
Kannan
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEVAwUBSvGgSHlTqcY7ytmIAQL9hQgAla/3xWhocYPyu/Ta0ICXu6Wc3PwGGCub
lSezgnzV22Tiu//KI2K+2swHVuVx/680kPkL9XTuvV9xPmvFj6mLZXNhFVqQynHx
W1hWUKaTRaa+z2Esc2n+eJcfK58CKHFX9n0gXCV1rrMedQTIzjCkWSVQiqtWQdzh
+PBVKv0FQwQ90vLdzkQA+FaSfpOgUR9NfSWLYpurCuWu6l070zHJUWrXo2Th0JE+
AK63OA924b+sOYLPgELKqjgQKkki7btcsjlW4SIyAjAhuRi4Pkz3L3frEjtFNNDY
FZ2FL1ElXTTDn8F16jSJmokdrwylQ73BU1dttqAJqWgduIP7Ak9xdw==
=c4fY
-----END PGP SIGNATURE-----

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

Received on 2009-11-04 16:41:29 CET

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