Hi Ryan,
What you suggested was exactly what I needed. But I could not perform a
successful merge. I have listed the output below.
Your help is very much appreciated.
Step 1
------
svn log svn://maggie/sgs/branches/sgsTest/Test1.txt
------------------------------------------------------------------------
r44 | lakshman | 2006-08-17 17:10:59 +1000 (Thu, 17 Aug 2006) | 1 line
Step 2
------
svn merge --dry-run -r44:44 svn://lakshman@maggie/sgs/branches/sgsTest
Step 3
------
svn merge --dry-run -r43:44 svn://lakshman@maggie/sgs/branches/sgsTest
A Test2.txt
A Test1.txt
Step 4
------
svn merge --dry-run -r43:44
svn://lakshman@maggie/sgs/branches/sgsTest/Test1.txt Test1.txt
svn: Use --force to override this restriction
svn: 'Test1.txt' is not under version control
Step 5
------
svn merge --force --dry-run -r43:44
svn://lakshman@maggie/sgs/branches/sgsTest/Test1.txt Test1.txt
svn: Use --force to override this restriction
svn: 'Test1.txt' is not under version control
Could you please let me know the correct command.
PS : Not sure, but doesn't merge need a directory, I didn't know that we
could do merges at file
level.
Thanks
Lakshman
> -----Original Message-----
> From: Ryan Schmidt [mailto:subversion-2006c@ryandesign.com]
> Sent: Thursday, 17 August 2006 9:15 PM
> To: Lakshman Srilakshmanan
> Cc: users@subversion.tigris.org
> Subject: Re: Merging and Ancestry
>
>
> On Aug 17, 2006, at 10:37, Lakshman Srilakshmanan wrote:
>
> > The problem I have is, Scenario 2 being the correct process, how do
I
> > merge a select set of files from /Branch/A into /Branch/B. Using
> > r20:21
> > is not possible as the test.txt may not be the only change in that
> > revision.
> >
> > Is there an alternate way ?
>
> Specify the revision range and the filename.
>
> svn merge -r20:21 $REPO/project/branches/branch2/file.txt file.txt
>
> Or something like that.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Aug 18 04:37:01 2006