[TYPO3-dev] svn help

[Xavier Perseguers]

Hi,

>> On 16.04.2009 09:23 Steffen Kamper wrote:
>>> i want to synchronize another branch with core trunk.
>>> How can i make a diff with all changes since a certain revision?
>>>
>>
>> svn diff -r REVISION_NUMBER
>>
>> svn diff --help
>>
> 
> such easy? shame on me ...
> I tried to find such option in tortoise log browser (as i mostly work on 
> windows without command line)

With Tortoise:

- check-out branch, make sure you do not have local modifications
- right click "SVN > Merge..."
- choose to merge revisions
- choose trunk as source
- show log to select revisions you want to merge into branch
- merge (with or without "dry-run")

Your local copy of branch is now modified with the merged revisions. You 
may create/show/... the diff as usual when your local copy as 
modifications regarding the original state in SVN.

Regards

-- 
Xavier Perseguers
http://xavier.perseguers.ch/en/tutorials/typo3.html