Problems with merge from trunk to branch after moving and renaming files.

I am trying to "merge" one particular revision from trunk to branch. In this particular revision [ on *trunk* ]
(a) a new directory was added
(b) some exisiting files + directories were moved to the newly created directory and renamed as well.

Step1: Changes made on trunk and committed
++++++++++++++++++++++++++++++++
svn log -r 133164 <trunkURL>

D lib/geography.php
D lib/networks.php
D lib/global_cities.php
D lib/ip
......
....
....
A lib/geo
A lib/geo/global_cities.php
A lib/geo/ip
A lib/geo/ip/constants.php
A lib/geo/ip/NetAcuity_lookup.php
A lib/geo/ip/NetAcuity.php
A lib/geo/ip/core.php
A lib/geo/ip/ip.php

Step 2: Merge from trunk to branch of revision 133164
+++++++++++++++++++++++++++++++++++++++++
NOW when I try and merge from the trunk into the branch I get this error message ==>>

svn merge -c 133164 <trunkURL> <WC-branchURL>

--- Merging r133164 into '.':
D lib/geography.php
D lib/networks.php
D lib/global_cities.php
D lib/ip
.....
......
......
A lib/geo
A lib/geo/global_cities.php
A lib/geo/ip
A lib/geo/ip/constants.php
A lib/geo/ip/NetAcuity_lookup.php
A lib/geo/ip/NetAcuity.php
A lib/geo/ip/core.php
A lib/geo/ip/ip.php

svn: File not found: revision 133164, path '/tfb/branches/aurora/www/lib/geo/ip'

NOW it does appear to have successfully added / deleted all the files and dirs from rev# 133164 but still puts out this strange error message. IS this really an error?.

It appears It seems that svn merge has issues when merging change-sets that include an svn mv that go into a new directory created in the same change-set. Are there nny known bugs

Any help will be appreciated.

Cheers
murli

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2008-12-18 18:25:06 CET