>
Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851 VAT Reg No 778499447 -----Original Message----- > From: J. Bakshi [mailto:joyd...@infoservices.in] > Sent: 02 March 2010 11:56 > To: Giulio Troccoli > Cc: users@subversion.apache.org > Subject: Re: strange problem with subversion merge > > On 03/02/2010 05:02 PM, Giulio Troccoli wrote: > > <snip> > >> ```````````````` > >> svn merge -r 475:476 trunk/ > >> ````````````````` > >> just returns null value. It should merge the changes I made at > >> branches/mybranch/folder1/file1 to trunk/folder1/file1. > Have I missed > >> something ? Please suggest. > >> > >> > > </snip> > > I understand you want to merge the changes you have done in > the branch to the trunk. If that's the case then from the > branch you use the --reintegrate option. > > > > The merge command you issued merges the changes between 475 > and 476 done to trunk into the directory you are in. Since > the changes happened on the branch it's correct that it > doesn't merge anything. > > > > > > > Hello, > > Thanks a lot for your response. I am afraid but I am not > fully understand the logic. Which I am following is collected > from net and I have just doing the same. I admit I don't know > the in-depth about how merging works. It might be interesting > that I am now getting something new than the empty return as > before. Please fine below Ok, let's start on what you did before. You created a branch "mybranch" from trunk to work on something. This is correct and the following is roughly what you should do in such cases - create the branch (done) - checkout the branch (done in branches/mybranch) - work on the branch committing as many times as you like - regularly merge the changes done in trunk cd branches/mybranch svn merge ^/trunk svn commit - when you're done with the branch and you want to merge it back to trunk cd branches/mybranch svn merge ^/trunk svn commit cd trunk svn merge --reintegrate ^/branches/mybranch This works because of merge-tracking. Unfortunately I think your version of SVN server (1.5.1) has some problem with merge-tracking. Other members of this ML hopefully will tell you for sure. I suggest you upgrade your server anyway to the latest SVN which is 1.6.9. > `````````````````` > svn diff -r 488:489 > Index: branches/bug/typo3conf/localconf.php > =================================================================== > --- branches/bug/typo3conf/localconf.php (revision 488) > +++ branches/bug/typo3conf/localconf.php (revision 489) > @@ -1,9 +1,12 @@ > <?php > > -qqwq > -wq > -wqq > -qw > +wew > +wew > +ew > +wew > + > `````````````````````` > > The modification is done at > branches/bug/typo3conf/localconf.php. Now I try to merge it to trunk > > ``````````````` > svn merge --dry-run -r 488:489 branches/bug/ trunk/ > > --- Merging r489 into 'trunk': > C trunk/typo3conf/localconf.php > Summary of conflicts: > Text conflicts: 1 > ```````````` That usually means that there are some changes done in trunk/typo3conf/localconf.php that were not merged into branches/bug/type3conf/localconf.php. What does the log command on both files show? Giulio
