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

[Johannes Wienke]

Gilles Caulier wrote:
> 2010/7/23 Johannes Wienke <jwienke at techfak.uni-bielefeld.de>:
>> Hi,
>>
>> you need to specify which revisions you want to merge into the branch.
>> That means you want (trunk revisions last merge + 1):HEAD. Otherwise old
>> revisions that were already merged are probably merged again. Svn isn't
>> that good at tracking what was already merged.
> 
> Why ? By default svn use HEAD, as said documentation.

Yes, as the last revision to merge, but the interesting point is that
you do not want to merge all changes since revision 0. So you have to
specify a starting revision and that is the revision of the last merge + 1.

Johannes

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 252 bytes
Desc: OpenPGP digital signature
URL: <http://mail.kde.org/pipermail/digikam-devel/attachments/20100723/d92ba45c/attachment.sig>