Return-Path: 
 <cloudstack-dev-return-27059-apmail-incubator-cloudstack-dev-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org
Delivered-To: apmail-incubator-cloudstack-dev-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 07DE3D204
	for <apmail-incubator-cloudstack-dev-archive@minotaur.apache.org>;
 Fri,  8 Mar 2013 22:35:47 +0000 (UTC)
Received: (qmail 22400 invoked by uid 500); 8 Mar 2013 22:35:46 -0000
Delivered-To: apmail-incubator-cloudstack-dev-archive@incubator.apache.org
Received: (qmail 22277 invoked by uid 500); 8 Mar 2013 22:35:46 -0000
Mailing-List: contact cloudstack-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-dev-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-dev-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-dev@incubator.apache.org>
List-Id: <cloudstack-dev.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-dev@incubator.apache.org
Received: (qmail 22269 invoked by uid 99); 8 Mar 2013 22:35:46 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Mar 2013 22:35:46 +0000
X-ASF-Spam-Status: No, hits=-5.0 required=5.0
	tests=RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS
X-Spam-Check-By: apache.org
Received-SPF: pass (athena.apache.org: domain of min.chen@citrix.com
 designates 66.165.176.89 as permitted sender)
Received: from [66.165.176.89] (HELO SMTP.CITRIX.COM) (66.165.176.89)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Mar 2013 22:35:41 +0000
X-IronPort-AV: E=Sophos;i="4.84,810,1355097600";
   d="scan'208";a="12156211"
Received: from sjcpmailmx01.citrite.net ([10.216.14.74])
  by FTLPIPO01.CITRIX.COM with ESMTP/TLS/RC4-MD5; 08 Mar 2013 22:35:20 +0000
Received: from SJCPMAILBOX01.citrite.net ([10.216.4.72]) by
 SJCPMAILMX01.citrite.net ([10.216.14.74]) with mapi; Fri, 8 Mar 2013 14:35:19
 -0800
From: Min Chen <min.chen@citrix.com>
To: "cloudstack-dev@incubator.apache.org"
	<cloudstack-dev@incubator.apache.org>, Chip Childers
	<chip.childers@sungard.com>
CC: Sanjay Tripathi <sanjay.tripathi@citrix.com>, Alena Prokharchyk
	<Alena.Prokharchyk@citrix.com>
Date: Fri, 8 Mar 2013 14:35:19 -0800
Subject: Re: master build is broken again
Thread-Topic: master build is broken again
Thread-Index: Ac4cTTbOBX8rIsQ3TMCpqqDyVtU7SQ==
Message-ID: <CD5FA783.C946%min.chen@citrix.com>
In-Reply-To: 
 <C66C814C1ABFA8449FF65CB44953A8B4012ED82671C3@SJCPMAILBOX01.citrite.net>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
user-agent: Microsoft-MacOutlook/14.3.1.130117
acceptlanguage: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Virus-Checked: Checked by ClamAV on apache.org

Thanks for the tip, Chip and Edison.
Updated the wiki page
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Git#Git-Applypatches
 for this topic so that others will not make such mistakes.

-min

On 3/8/13 2:28 PM, "Edison Su" <Edison.su@citrix.com> wrote:

>"git clean -f" will clean up your workspace, in case there are temporary
>untracked files under your workspace.
>Always "git status" before "git push", to make sure all the files are
>checked in.
>But, anyway, this kind of error happens all the time, we'd better have a
>staging tree, just for checking in code and test.
>
>> -----Original Message-----
>> From: Min Chen [mailto:min.chen@citrix.com]
>> Sent: Friday, March 08, 2013 11:50 AM
>> To: cloudstack-dev@incubator.apache.org; Chip Childers
>> Cc: Sanjay Tripathi; Alena Prokharchyk
>> Subject: Re: master build is broken again
>>=20
>> Found the problem, it is my innocent mistake due to misunderstanding git
>> command. I used the following command to apply Sanjay's patch:
>>=20
>> git apply <patch>
>> git commit -as
>>=20
>> and thought that "git apply" will put those newly added files into
>>tracked files,
>> but it actually is not doing that. I still need to manually run git add
>>to add
>> those files. It compiled fine on my workspace, since I have those added
>>files.
>> Sorry for the inconvenience.
>>=20
>> Thanks
>> -min
>>=20
>> On 3/8/13 11:41 AM, "Min Chen" <min.chen@citrix.com> wrote:
>>=20
>> >I am investigating it, and I applied Sanjay's patch, and compiled fine
>> >in my machine. I will update within a minute.
>> >
>> >Thanks
>> >-min
>> >
>> >On 3/8/13 11:35 AM, "Chip Childers" <chip.childers@sungard.com> wrote:
>> >
>> >>On Sat, Mar 09, 2013 at 01:02:19AM +0530, Pranav Saxena wrote:
>> >>> This commit seems to be the culprit - Commit:
>> >>>http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5e
>> >>>4c2
>> >>>c
>> >>>8a
>> >>>
>> >>
>> >>It is.  I -1'd it, and reverted.
>> >>
>> >>>
>> >>> -----Original Message-----
>> >>> From: Alena Prokharchyk [mailto:Alena.Prokharchyk@citrix.com]
>> >>> Sent: Saturday, March 09, 2013 12:55 AM
>> >>> To: cloudstack-dev@incubator.apache.org
>> >>> Subject: master build is broken again
>> >>>
>> >>> Master branch doesn't compile after fetching the latest code. Please
>> >>>fix whoever's commit caused it.
>> >>>
>> >>>
>> >>> mvn clean install -P developer,systemvm
>> >>>
>> >>>
>> >>> ERROR] Failed to execute goal
>> >>> org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile
>> >>> (default-compile) on project cloud-api: Compilation failure:
>> >>>Compilation
>> >>> failure:
>> >>> [ERROR]
>> >>>
>> >>>/Users/alena/cloudstack-
>> oss/api/src/com/cloud/server/ManagementServic
>> >>>e.j
>> >>>a
>> >>>va
>> >>> :[32,55] cannot find symbol
>> >>> [ERROR] symbol  : class ArchiveAlertsCmd [ERROR] location: package
>> >>>org.apache.cloudstack.api.command.admin.resource
>> >>> [ERROR]
>> >>>
>> >>>/Users/alena/cloudstack-
>> oss/api/src/com/cloud/server/ManagementServic
>> >>>e.j
>> >>>a
>> >>>va
>> >>> :[33,55] cannot find symbol
>> >>>
>> >>>
>> >
>