we have a serious merging problem, as I noticed that somehow the
svn:mergeinfo got lost while merging I immediately stopped my merging
steps and started over with new branches. Yesterday I came across
following bugfix as it seems that I had the same problem:
In this moment we have unfortunately three development lines:
1. the old code base, which is still on the live servers
2. the new code base:
2.1 the new trunk, where feature development is done
2.2 the stability and bugfix branch which is supposed to go live
soon (let's call it 4.5, as this is the actual branch version)
What I did now is:
1. Merge all bugfixes we did in the old codebase into the branch 4.5
mentioned in 2.2, we needed them there first
2. As something with the svn:mergeinfo went wrong, I stopped my
attempted to merge anything else into our new trunk
3. I created a new branch, copied from 4.5, and merged all further
development from the new trunk into this new branch (called
reintegrate-trunk-into-4.5). I did this because I had problems before
and I wanted a new, independent branch without breaking the branches
where people are developing on.
All this happened with subversion 1.8.0 (The server is on 1.7).
I have now a ready branch, containing absolutely all commits I need,
from the old code base, from 4.5 bug fixes and from the development in
the new trunk. But I am not able to merge this into our new trunk back
again, with following error messages:
trunk$ svn merge
svn: E195016: Reintegrate can only be used if revisions 32893 through
33722 were previously merged from https://URL/Projekte/fazcore/trunk
to the reintegrate source, but this is not the case:
(about 30-40 more of those errors)
The fact is, that those revisions are merged into the
reintegrate-trunk-into-4.5 branch already:
reintegrate-trunk-into-4.5$ svn propget svn:mergeinfo . | grep 'fazcore/trunk'
Is there a way to "repair" this merge info so that it gets recognized
when merging back into trunk?
Or is there a way to force the merging anyway (beside
--ignore-ancestry, I'd like to keep the merge history)?
Or at least to merge the rest, excluding those problematic files?
Thanks very much and best regards
Received on 2013-11-01 08:56:07 CET