On 03/02/2010 07:48 PM, Giulio Troccoli wrote: > >>>>>> ```````````````` >>>>>> svn merge -r 475:476 trunk/ >>>>>> ````````````````` >>>>>> > >> ```````````````` >> svn merge --dry-run -r 490:491 trunk/typo3conf/ branches/bug/ >> Skipped missing target: 'branches/bug/localconf.php' >> ``````````` >> > But these commands are not the same. > > >From your previous email I understand the bug branch was created as a copy > >of trunk. What you're trying here is to merge the changes in trunk/typo3conf > >to a copy of trunk, instead of a copy of trunk/typo3conf. >
You are absolute correct. the bug branch is a copy of trunk and it has been created to do the bug fixing. Once done then it should be allowed to merge into trunk. Please suggest how can I achieve this. Meanwhile I am going to five a read to the link you have mentioned here. Thanks > You seem to be very confused about merging. Maybe you should (re)read the > documenation. http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html > > > 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 > > > > > > -- জয়দীপ বক্সী
