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

Re: Merge prerequisites

From: Thomas Recloux <thomas.recloux_at_gmail.com>
Date: 2007-01-03 14:33:15 CET

> svn merge -r 15:15 file:///var/subversion/myproject/trunk , merge
> doesn't works.

It can't, you are applying the diff between revision 15 and revision
15. There is no diff => no change in your local copy.

> eg.
> Sally works on main trunk and she is at revision 5.
> Mike creates branch with revision 5.
> Now Mike commits 10 times, and hi is at version 15.
> Sally now commits once and she is at version 6.

No, revisions are global to the repository. If the start revision is 5
and users are commiting 11 times, the last revision is 16.

> Now Mikes concludes that Sally has changes that he wants and wants to merge
> |-> He exports project

Exports ? with svn export ?

> |-> In working directory he does svn merge -r 15:6
> file:///var/subversion/myproject/trunk

If the last revision is 15, and if you want to bring trunk's changes
on the branch, execute this command an a branch working copy :

svn merge -r 5:15 file:///var/subversion/myproject/trunk

Svn will apply on the working copy, the changes commited on trunk
between revisions 5 and 15

I think you should read this doc :
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.html

-- 
Thomas Recloux
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 3 14:33:39 2007

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