[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: SVN Copy

From: Ramachandran, Vishwanath(IE10) <Vishwanath.Ramachandran_at_Honeywell.com>
Date: Mon, 8 Mar 2010 20:16:48 +0530

Ok, thank you for the reply







From: Michael P. Reilly [mailto:arcege_at_gmail.com]
Sent: Monday, March 08, 2010 8:12 PM
To: Ramachandran, Vishwanath(IE10)
Cc: users_at_subversion.apache.org
Subject: Re: SVN Copy



On Mon, Mar 8, 2010 at 9:27 AM, Ramachandran, Vishwanath(IE10)
<Vishwanath.Ramachandran_at_honeywell.com> wrote:

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:

For example:
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'

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:47:29 CET

This is an archived mail posted to the Subversion Users mailing list.