Re: how do you merge into 1.5.x

mohsen s wrote:
> 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.

You can do that as you prefer. Merging from trunk to 1.6.x is not always
possible or won't always work because the strings might be too
different, and strings which are present on the branch might not be
present on the trunk anymore.
So sometimes, to get a translation done you have to do it on the branch
directly.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2357261
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].