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

Merge prerequisites

From: Nikola <root.admin1_at_zg.t-com.hr>
Date: 2007-01-03 13:11:59 CET

Are there any merge prerequisites because of the following:

I have created test project and imported it ...when I checkout it I get

|-- myproject
| |-- file1.txt
| `-- file2.txt

Now I have created branch, that also works without problems:

|-- my-project-branch-1
| |-- file1.txt
| `-- file2.txt

Now what I have detected is that when I try to merge with

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

everyting works fine ...but if I try to merge with

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

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.
Now Mikes concludes that Sally has changes that he wants and wants to merge
|-> He exports project
|-> In working directory he does svn merge -r 15:6

** Now this is the problem I have encounterd.
If current working version is higher ...I cannot merge...merge exits

But if I do multiple commits the I can do it: svn merge -r 15:16

tnx in advance.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 3 13:12:18 2007

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.