On Mon, Mar 8, 2010 at 9:27 AM, Ramachandran, Vishwanath(IE10) <
> Hi Michael
> Thanks for the reply. You suggest to go for Merge instead of Copy?
> Currently our SVN server is 1.4.6, we cannot implement Merge here. We are in
> the process of upgrading the server. Any other alternative solution for a
> temporary fix.
Why can you not perform a merge operation on a 1.4 server? I've been
performing complex merge operations for five years going back to at least
1.3.x servers and probably before that with SVN 1.2.
You perform the merge, and when you commit, you include the branch and
revision ranges of what was being merged in the comment string:
svn checkout http://...../trunk code-to-merge
svn merge -r 59:103 http://branches/foobar code-to-merge
svn commit -m 'Merged from /repos/.../branches/foobar_at_59:103' code-to-merge
You could also put this information inside attributes which is what 1.5.x
does, but I found that it was easier for the developers to handle it inside
the commit string.
There's so many different worlds,
So many different suns.
And we have just one world,
But we live in different ones.
Received on 2010-03-08 15:42:47 CET