I'm currently preparing our move from CVS to SVN. We've got a rather
large application consisting of several modules some of which are
specific for some customers.
Our repository will look like this:
/trunk/customerABC-module-1 (several modules per customer)
So, we only get some of the modules (read: subdirectories) of /trunk in
the customer branches. When converting using cvs2svn it generates SVN
commits like this:
add /branches/customerABC/solution1/1.0/ (copy from /trunk)
Of course, when reintegrating to trunk, I'm guaranteed to get a tree
conflict if anything has been changed there (and if not, the module gets
deleted which is even worse).
After the move to SVN, merging will not be a problem since I've created a
wrapper script which allows us to branch only certain modules (using SVN
copy with multiple sources). This has the disadvantage that the topmost
branch directory like /branches/customerDEF/solution2/1.0/ is not a
parent of /trunk/ but we can work around that by applying "svn merge" to
each module sequentially, then committing everything at once.
So back to my original question: How do I manage these kinds of merges?
- How do I avoid tree conflicts when merging trunk to branch and there are
changes in a module not present in the branch?
- How do I avoid merging back the "delete module" operation generated by
"What we nourish flourishes." - "Was wir nähren erblüht."
Received on 2010-09-20 12:44:31 CEST