> >>>> ```````````````` > >>>> 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 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
