@Thomas -- I get the following message..it saying there are merge conflicts 
,even if there are merge conflitcs..it should sync all the files and git 
status should show them but git status just shows 2 files while there are 
10 files in the patch set.

error: could not apply d50d931... code: Wait for ack and issue delsta after 
transmitting the
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Resolved 'file.h' using previous resolution.
Resolved 'file2.h' using previous resolution.

On Thursday, January 10, 2013 11:26:44 PM UTC-8, Thomas Ferris Nicolaisen 
> On Friday, January 11, 2013 8:21:54 AM UTC+1, python...@gmail.com wrote:
>> Has anyone run into a problem where you cherrypick a gerrit and all the 
>> files are not present?following is the sequence of commands I do..
>> any thoughts on what could be the reason?
>> are there ways other than cherrypicking to sync a file?
>>     repo init -u git://git.company.com/platform/manifest.git -b 
>> jb_2.2_rb2_5
>>     repo sync vendor/com/proprietary/code
>>     git fetch ssh://
>> usern...@review-android.company.com:29418/platform/vendor/com-proprietary/coderefs/changes/42/185542/2
>>  && git cherry-pick FETCH_HEAD
> This is very hard to figure out with having access to your gerrit instance 
> or the patches within it.
> Could you try cherry-picking off a public Gerrit instance and see if you 
> see the same effect?
> Here are a few public ones you can choose from: 
> http://code.google.com/p/gerrit/wiki/ShowCases 
> Could it be that the change-set you are cherry-picking depends on another 
> change-set that introduced the files you are missing?
> What is the output of the cherry-pick command?


Reply via email to