A lesson learnt, just tried git apply <patch> and git am < patch on my
system, it seems that I should use "git am" to apply the patch, which will
automatically add those new files into tracked files. I will use "git am"
in the future.

Thanks
-min

On 3/8/13 11:53 AM, "Chip Childers" <chip.child...@sungard.com> wrote:

>On Fri, Mar 08, 2013 at 11:50:27AM -0800, Min Chen wrote:
>> Found the problem, it is my innocent mistake due to misunderstanding git
>> command. I used the following command to apply Sanjay's patch:
>> 
>> git apply <patch>
>> git commit -as
>> 
>> 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.
>
>Great - please re-apply after testing the build!
>
>(-1 taken back if the build works after it's re-committed)
>
>> 
>> Thanks
>> -min
>> 
>> On 3/8/13 11:41 AM, "Min Chen" <min.c...@citrix.com> wrote:
>> 
>> >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.child...@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/5e4
>>>>>c2
>> >>>c
>> >>>8a
>> >>> 
>> >>
>> >>It is.  I -1'd it, and reverted.
>> >>
>> >>> 
>> >>> -----Original Message-----
>> >>> From: Alena Prokharchyk [mailto:alena.prokharc...@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/ManagementService
>>>>>.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/ManagementService
>>>>>.j
>> >>>a
>> >>>va
>> >>> :[33,55] cannot find symbol
>> >>> 
>> >>> 
>> >
>> 
>> 

Reply via email to