From:	"Lewis" <cwmm-dev@2rosenthals.com>
Subject:	Re: [cwmm-dev] Proposed sync merge of TW localization into v2.9 branch
Date:	Wed, 22 Jul 2020 16:28:02 -0400
To:	CWMM Developers Mailing List <cwmm-dev@2rosenthals.com>

On 07/22/20 01:06 am, Lewis wrote: On 07/21/20 11:05 pm, Dave Yeo wrote: On 07/21/20 10:39 AM, Lewis wrote: Are there any objections to me merging the /tw/ localizations from trunk into the v2.9 branch? Not here. Guess the makefiles will need updating at some point. r22. These were a series of svn cp operations from trunk (WC -> WC). The end result is what we want (revision history is sticky), so, e.g.: 1}[j:\devel\cwmmclasses\branches\v2.9\classes\res] svn status -v tw 22 22 lewisr tw 22 4 stevenhl tw/audioconv_tw.dlg 22 4 stevenhl tw/audioconv_tw.rc 22 4 stevenhl tw/audioplayer_tw.dlg 22 4 stevenhl tw/audioplayer_tw.rc 22 4 stevenhl tw/classvolume_tw.dlg 22 4 stevenhl tw/cwaudio_tw.dlg 22 4 stevenhl tw/cwaudio_tw.rc 22 4 stevenhl tw/cwimage_tw.rc 22 4 stevenhl tw/cwvideo_tw.rc 22 4 stevenhl tw/imageconv_tw.dlg 22 4 stevenhl tw/imageconv_tw.rc 22 4 stevenhl tw/makefile 22 4 stevenhl tw/mmfind_tw.dlg 22 4 stevenhl tw/mmfind_tw.rc 22 4 stevenhl tw/mmres_tw.DEF 22 4 stevenhl tw/mmres_tw.c 22 4 stevenhl tw/mmres_tw.rc 22 4 stevenhl tw/volume_tw.dlg 22 4 stevenhl tw/volume_tw.rc This shows that Steve's r4 was the source of the file, and my r22 was the last commit. Indeed, svn log -v on that directory gives us: r22 | lewisr | 2020-07-22 16:05:01 +0100 (Wed, 22 Jul 2020) | 2 lines Changed paths: A /branches/v2.9/classes/help/tw (from /trunk/classes/help/tw:21) A /branches/v2.9/classes/res/tw (from /trunk/classes/res/tw:21) A /branches/v2.9/mediafolder/prog_tutorial_tw (from /trunk/mediafolder/prog_tutorial_tw:21) A /branches/v2.9/mediafolder/res/tw (from /trunk/mediafolder/res/tw:21) Merge trunk TW localization to v2.9 branch. ------------------------------------------------------------------------ r4 | stevenhl | 2017-07-12 23:17:57 +0100 (Wed, 12 Jul 2017) | 1 line Changed paths: [...] A /trunk/classes/res/tw A /trunk/classes/res/tw/audioconv_tw.dlg A /trunk/classes/res/tw/audioconv_tw.rc A /trunk/classes/res/tw/audioplayer_tw.dlg A /trunk/classes/res/tw/audioplayer_tw.rc A /trunk/classes/res/tw/classvolume_tw.dlg A /trunk/classes/res/tw/cwaudio_tw.dlg A /trunk/classes/res/tw/cwaudio_tw.rc A /trunk/classes/res/tw/cwimage_tw.rc A /trunk/classes/res/tw/cwvideo_tw.rc A /trunk/classes/res/tw/imageconv_tw.dlg A /trunk/classes/res/tw/imageconv_tw.rc A /trunk/classes/res/tw/makefile A /trunk/classes/res/tw/mmfind_tw.dlg A /trunk/classes/res/tw/mmfind_tw.rc A /trunk/classes/res/tw/mmres_tw.DEF A /trunk/classes/res/tw/mmres_tw.c A /trunk/classes/res/tw/mmres_tw.rc A /trunk/classes/res/tw/volume_tw.dlg A /trunk/classes/res/tw/volume_tw.rc [...] Import modifications from cwmm-0_2_9-work-01_10_2006.zip dated 2006-08-27 so we know from whence those originals came (since we've been discussing svn tips'n'tricks elsewhere). (The ":21" at the end of each path in the r22 commit detail refers to the source revision for the svn copy. As my workspace had been updated to r21 prior to my svn cp, and I did a working copy -> working copy operation, that was my source level, or "working revision.") <snip> Hopefully, this won't cause you any added complications for your work, Dave. I suspect that the makefile changes to include this localization in the build came along with the same r4 on trunk, and as I only copied the downlevel files, for now, these should be blissfully ignored. -- Lewis

: , , .