[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sun, 31 May 2009 13:30:12 +0200

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


  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 13:30:27 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.