Hi,
I'm working on a codebase that is to be used by two different compilers. I have
a trunk-branch layout but realize that does not work that well for this. What
seems to be needed are two "trunks" somehow. Is that possible?
I would like to be able to avoid to clutter the code with #ifdefs in
Ff after you re-integrate you merge that rev from trunk with --record-only you can keep
using the same branch. But, yes for the most part, "reintegrate" is designed
for feature branches which are generally not used/needed after the feature is
reintegrated into trunk.
I am sometimes using tor
You will want to read
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice
if you plan on using --reintegrate while keeping the branch around.
Thanks! It will save me much time!
Someone said that merges are easy.. I have read the svn book about merges but it
does not help.
I create a branch and I can keep it synchronized with the trunk.
I can even re-integrate the branch with the trunk.
From now on, it seems the branch is useless since I can't continue working on
it a
