[Digikam-devel] how to synchronize properly GOsC 2010 branch with trunk

[Marcel Wiesweg]

Hi,

to clear up this question retrospectively, my command is

svn merge -r1142641:HEAD svn+ssh://mwiesweg@svn.kde.org/home/kde/trunk/extragear/graphics/digikam

executed in the working dir from the branch, where 1142641 
is the last merged revision (svn merge will output "merging from 1142641 to xy",
where I take a note of the number given and write it in the commit message)

Marcel