we're using 1.9.0 reintegrate style branch had gone through few iterations merging trunk branch , reintegration trunk. have copied trunk, chose copy branch branch.
svn cp -m "" ^/branches/b1 ^/branches/b2
b1 rev 3944 b2 @ 3945. after further commits trunk , switching working copy b2 branch, trying merge trunk b2 wc gave error such as
svn: e160013: '/repos/projectname/!svn/rvr/3944/branches/b2' path not found
using --force showed svn considered merge reintegrate like, presumably because b1 reintegrate style branch.
repeating copy of b1@3944 , trying merge gave same error expected.
any ideas on reason error?
we copied trunk new branch move on, 1 might want copy branch without bringing trunk date first. wondering if it's related bug in 1.9 found whereby reintegrate merge can stuck in perpetual cycle of unnecessary property updates, i.e. after merge trunk , commit, trunk branch merge says properties need updated on branch. merge , commit , merge branch trunk says properties need updated on trunk, , on.
for intellij idea
in project merging to:
- open "configure branches" under subversion working copies information.
- there should 3 options under branch locations: branches, patches, , tags
- remove 1 branches.
now should able open merge dialog.
Comments
Post a Comment