Ryan Schmidt wrote:
> On Oct 26, 2005, at 15:54, Anastasios Angelidis wrote:
>
>> I run: svn log --verbose svn://myserver/Development/Test_Project and
>> get listing below.
>>
>> I would like to merge r4 into r5 so I run: svn merge -r 4:5 svn://
>> mtlw-angt-01/Development/Test_Project/Trunk But I get a blank
>> response. Bassically svn returns to the prompt again. What I'm I
>> doing wrong?
>>
>> Thanks
>>
>> ----------------------------------------------------------------------
>> --
>> r5 | tassoa | 2005-10-25 16:46:20 -0400 (Tue, 25 Oct 2005) | 1 line
>> Changed paths:
>> M /Test_Project/Trunk/index.html
>>
>> Added new paragraph.
>> ----------------------------------------------------------------------
>> --
>> r4 | tassoa | 2005-10-25 16:44:57 -0400 (Tue, 25 Oct 2005) | 1 line
>> Changed paths:
>> M /Test_Project/Branches/Bug_Fixes/index.html
>>
>> Fixed spelling mistake found in the <title> tag. Should read "Hello
>> World!" and not "Hello Wrld!".
>> ----------------------------------------------------------------------
>> --
>
>
> You're confused about terminology.
>
> A revision of the repository represents a point in time. At revision
> 4, it looked one way, and at revision 5, it looked a slightly
> different way. Revisions are permanent and never get changed again.
>
> In revision 4, you made a change to a file in a directory Bug_Fixes
> in the directory Branches. I assume what you want to do is to make
> that same change to the same file in the directory Trunk.
Yes
>
> In that case, get a working copy of Trunk, go into it, and merge the
> change into the working copy:
>
> cd /path/to/working/copy/of/Trunk
> svn merge -r3:4 svn://myserver/Development/Test_Project/Branches/
> Bug_Fixes
>
> This means "Make a recipe that transforms revision 3 of the Bug_Fixes
> branch into revision 4, and apply that recipe to the working copy I'm
> in right now."
Ok it worked but I'm not exactly understanding why -r3:4. The working
copy is at r5 and I want to merge r4 into it... to make the working copy
finally r6. Maybe you can explain it differently? Thanks
>
> Now you resolve any conflicts that might have occurred, test the
> change to make sure it works, then you commit the working copy,
> stating in your commit message that you merged revision 4 of the
> Bug_Fixes branch into the trunk.
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 26 17:12:37 2005