gclient sync error when sycn with chromium branch 39.0.2171.95

[Robert Wang]

Hi, 

I want to build chromium version 39.0.2171.95.  I fetch the chromium code with the command "gclient fetch - nohooks" which the offical build instruction descriped. it will fetch the master branch of chromium.  None of the fetching files was modified. Then I do things bellow:

1. git fetch --tags

2. git checkout -b my_release_branch 39.0.2171.95

3. gclient sync --with_branch_heads --jobs 16

the 3rd step was failed, the infomation is :

_____ src at refs/remotes/origin/master

[0:03:04] Cannot fast-forward merge, attempt to rebase? (y)es / (q)uit / (s)kip

:

----------------------------------------

Error: 1> Background task requires input. Rerun gclient with --jobs=1 so that

1> interaction is possible.

But I modified none of any files. How Can I solve this problem?

 

Best Regards,

Robert

[Primiano Tucci]

The state of your local branch seems inconsistent.

A way to force (note: will destroy your local state is)

git checkout -B my_release_branch

git reset --hard 39.0.2171.95

git clean -df

gclient sync --with_branch_heads --jobs 16

Also make sure you do NOT have managed: True (i.e. it should be false) in your gclient

--
--
Chromium Developers mailing list: chromi...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-dev