Hello, all
I am having trouble reintegrating my fresh and
short-lived test branch (called progbar). Although
there have been no changes to the trunk since the
creation of the branch from revision 2524,
svn merge "^/branches/progbar" --reintegrate
gives:
svn: E195012: Unable to find repository location for
'<hidden'>svn/Sources/trunk' in revision 1823
trunk indeed was not created until revision 2252,
but I wonder why can SVN be interested in revision
1823, if I created my test branch by copying revi-
sion 2524 of the trunk:
------------------------------------------------------------------------
r2325 | GIT\Anton | 2017-12-23 16:54:44 +0300 | 1 line
Work done, merging with trunk to prepare for release.
------------------------------------------------------------------------
r2324 | GIT\Anton | 2017-12-23 16:43:25 +0300 | 1 line
Branch for progressbar modifications.
What I did was:
1. 'svn cp' of trunk into the new branch,
2. modify branch and commit the changes,
3. merge changes from the trunk into branch
(there were none)
4. go to trunk and merge changes form the branch
with --reintegrate.
I did all this over the course of an hour, on a hol-
iday, when nobody else was working.
--
Please, do not forward replies to my e-mail.
