We're trying to upgrade from EMC's Documentum 5.2.5 to 5.3 and
switching from CVS to SVN at the same time and we're having a bit of
trouble getting merge to do what we need. Our repository is set up
along these lines:
/trunk <-- currently contains 5.2.5, plus the changes we made to it
/branches/vendor/ <-- currently contains 5.3
/tags/dctm-525/ <-- the original unchanged copy of 5.2.5
What we need is to end up with a copy of 5.3 with our changes on top
of it. But all of our attempts to merge end up skipping
files/directories or deleting some of our stuff. We told the merge
command to ignore ancestry, and that seems to have helped but there's
still problems.
Other factors:
* Both the original 5.2.5 copy and the 5.3 copy include class files
that we don't have the source for, as well as class files that we do
have the source for. Our changes to 5.2.5 included removing the class
files that we have the source for from source control, since our build
process is just going to replace those files anyways.
* The changes from 5.2.5 to 5.3 include bunches of files that have
been added, removed, or updated. There are over a thousand files that
have changed, IIRC.
What process or commands would you guys recommend we use? We're
running out of things to try, and with 300+ MB getting pushed around
with every operation we do, it takes an hour or two for every failed
attempt.
Cheers,
Bob Aman
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Apr 6 17:24:03 2006