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

Understanding merging.

From: Anastasios Angelidis <voodoo_at_videotron.ca>
Date: 2005-10-26 15:54:06 CEST

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!".
------------------------------------------------------------------------
r3 | tassoa | 2005-10-25 16:39:48 -0400 (Tue, 25 Oct 2005) | 1 line
Changed paths:
   A /Test_Project/Branches/Bug_Fixes (from /Test_Project/Trunk:2)

Fix spelling mistake in the title of the page.
------------------------------------------------------------------------
r2 | tassoa | 2005-10-25 16:35:09 -0400 (Tue, 25 Oct 2005) | 1 line
Changed paths:
   M /Test_Project/Trunk/index.html

Started the html code for the home page.
------------------------------------------------------------------------
r1 | tassoa | 2005-10-25 16:31:48 -0400 (Tue, 25 Oct 2005) | 1 line
Changed paths:
   A /Test_Project
   A /Test_Project/Branches
   A /Test_Project/Tags
   A /Test_Project/Trunk
   A /Test_Project/Trunk/index.html

Initial import.
------------------------------------------------------------------------

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Oct 26 15:59:31 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.