[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: how do you merge into 1.5.x

From: Lübbe Onken <luebbe.tortoisesvn_at_googlemail.com>
Date: Sun, 31 May 2009 22:05:05 +0200

Hi Mohsen,
> hi, I merged 5-6 revisions into 1.5.x today of translations. when I
> check the log dialog with 'Include merged revisions' i see most
> language translations seem to be done on 1.5.x as they include no
> merge info. is this the case. the workflow that I use is to do work on
> trunk and merge into 1.5.x. I hope this is correct.
> Thanks

I hope you mean 1.6.x? There will probably be no releases from the 1.5.x
branch anymore.

Merging translations via (Tortoise)SVN from trunk to a branch works
well, if the .pot files are not too different as Stefan has already
pointed out.

What works well for me is the following. Copy (via explorer) the .po
file from trunk into a branch working copy. Open the copy of the .po
file in poedit and select "update from .pot file" from the menu. Then
you update the (explorer copy from trunk) .po file wiith the latest
branch .pot file. This will give you 100% on all the matching
translations, a lot of fuzzies and will reject the non-matching trunk


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-31 22:02:07 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.