Re: [Audacity-quality] website translation, and uncommitted files
A free multi-track audio editor and recorder
Brought to you by:
aosiniao
From: Gale A. <ga...@au...> - 2012-04-07 00:17:25
|
| From Vaughan Johnson <va...@au...> | Fri, 06 Apr 2012 14:09:41 -0700 | Subject: [Audacity-quality] website translation, and uncommitted files > > > On 4/6/2012 12:10 PM, Gale Andrews wrote: > > > > | From Vaughan Johnson <va...@au...> > > | Thu, 05 Apr 2012 18:46:59 -0700 > > | Subject: [Audacity-quality] website translation, and uncommitted files > >> On 4/5/2012 3:23 PM, Richard Ash wrote: > >>> > > As for the incorrect line endings on > > /website/trunk/htdocs/help/faq_i18n.php, that file was added > > to SVN by me, not Vaughan. > > > > As far as I recall, I did the same with that file as I always do: > > duplicate it to another name on the server using WinSCP, then > > when tested on the server, drag it to xplorer2, SVN "Add" and > > commit. > > > > At that time I was using an old 1.6.7 (?) version of TortoiseSVN > > and I have since updated to and am now using TortoiseSVN 1.6.16, > > further details: > > > > "Build 21511 - 64 Bit , Subversion 1.6.17, apr 1.3.12, apr-utils 1.3.12 > > neon 0.29.6, OpenSSL 1.0.0d 8 Feb 2011, zlib 1.2.5." > > > > I didn't like the look of issues stated with the latest 1.7 version of > > Tortoise SVN on their web site. > > > > However the reported \r issues with faq_i18n.php were not there > > when first committed, but only appeared after the extra "/" was > > added to include/news.inc.php. > > > > Did you see my email about this, on -translation? Richard was right that > it was the svn:eol-style not being set, when it should have been > "native". Had nothing to do with '/'. All I can say is that in practice I made a clean (no "\r") audacity_website.pot at r11607, then after r11608 when the "/" was added, I couldn't (and \r's" were then reported by make in faq_i18n.php, though I had not changed it since making the previous audacity_website.pot). Either way it seems DOS line endings got into my commits of new files, using WinSCP "duplicate" then drag to SVN tree in xplorer2 and "SVN Add" as usual. Like you, I don't recall new files being an issue before, but Richard has now explained what happens. Gale |