incubator-flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Harui <aha...@adobe.com>
Subject Re: svn commit: r1418451 - in /incubator/flex/sdk/branches/develop: ./ build.properties
Date Fri, 07 Dec 2012 23:32:53 GMT
I've never had a problem with SVN command line before.  I'm pretty sure I
used to specify a list of files including "." and it would do the right
thing.  Those even are the steps Paul Reilly had in our old wiki.

But it seems to now commit everything.

I didn't think SmartSVN knew to update the ".".  It never shows that in the
list of changes, and I do merges from the command line (still haven't paid
for full SmartSVN which supports merging).

Anyway, maybe I'll set up a merge-only working copy

On 12/7/12 1:41 PM, "Carol Frampton" <cframpto@adobe.com> wrote:

> You need to commit from root to get the merge info.  If you use the
> command line that means you can't have any other work.  If you use
> SmartSVN you can uncheck other pending changes but it is way slower than
> the command line.
> 
> Carol
> 
> On 12/7/12 2 :32PM, "Alex Harui" <aharui@adobe.com> wrote:
> 
>> Hmm.  Better, but still broken.  I have no idea how to commit the
>> mergeinfo
>> in svn anymore.  Will revert build.properties.
>> 
>> -- 
>> Alex Harui
>> Flex SDK Team
>> Adobe Systems, Inc.
>> http://blogs.adobe.com/aharui
>> 
>> ------ Forwarded Message
>> From: "aharui@apache.org" <aharui@apache.org>
>> Reply-To: "flex-dev@incubator.apache.org" <flex-dev@incubator.apache.org>
>> Date: Fri, 7 Dec 2012 11:29:57 -0800
>> To: "flex-commits@incubator.apache.org"
>> <flex-commits@incubator.apache.org>
>> Subject: svn commit: r1418451 - in /incubator/flex/sdk/branches/develop:
>> ./
>> build.properties
>> 
>> Author: aharui
>> Date: Fri Dec  7 19:29:56 2012
>> New Revision: 1418451
>> 
>> URL: http://svn.apache.org/viewvc?rev=1418451&view=rev
>> Log:
>> commit mergeinfo
>> 
>> Modified:
>>    incubator/flex/sdk/branches/develop/   (props changed)
>>    incubator/flex/sdk/branches/develop/build.properties
>> 
>> Propchange: incubator/flex/sdk/branches/develop/
>> --------------------------------------------------------------------------
>> --
>> --
>>    svn:mergeinfo = /incubator/flex/sdk/branches/release4.9:1418412
>> 
>> Modified: incubator/flex/sdk/branches/develop/build.properties
>> URL: 
>> http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/build.pro
>> pe
>> rties?rev=1418451&r1=1418450&r2=1418451&view=diff
>> ==========================================================================
>> ==
>> ==
>> --- incubator/flex/sdk/branches/develop/build.properties (original)
>> +++ incubator/flex/sdk/branches/develop/build.properties Fri Dec  7
>> 19:29:56
>> 2012
>> @@ -56,5 +56,7 @@ mxmlc.jvm.args = ${jvm.args}
>> manifest.sealed=false
>> manifest.Implementation-Title=Apache Flex SDK
>> manifest.Implementation-Version=${release.version}
>> -manifest.Implementation-Vendor=The Apache Software Foundation
>> +manifest.Implementation-Vendor=Apache Software Foundation
>> manifest.Implementation-Vendor-Id=org.apache
>> +
>> +localized.jars = true
>> 
>> 
>> 
>> ------ End of Forwarded Message
>> 
> 

-- 
Alex Harui
Flex SDK Team
Adobe Systems, Inc.
http://blogs.adobe.com/aharui


Mime
View raw message