gclient sync doesn't get new code? Or???

[vadimt]

Hi!

I was using (I guess) git-over-svn (forgive me if I'm using wrong terminology, I very rarely modify Chromium).

1 month ago I created a git branch and created some changes in it. While the changes were in CR, I didn't sync.

Today, I checked out 'master' and executed 'gclient sync'. It reported errors (The .gclient URL doesn't match URL in src).

I executed 'fetch chromium && gclient sync' and the issue went away.

However, when I checkout my branch and merge from master, I get "Already up-to-date.".

This is probably related to transition to Git, but I don't know what to do to really get latest to 'master'.

Ideas?

[Fabrice de Gans-Riberi]

This is probably stupid, but is your local master tracking origin/master? I think your local master was not updated. Try this:

git checkout master

git pull --rebase

git checkout <work_branch>

git rebase master

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

To unsubscribe from this group and stop receiving emails from it, send an email to chromium-dev...@chromium.org.

[Aaron Gable]

Gclient checkouts created by "fetch chromium" now default to "unmanaged" mode. This means that you have to manage the top-level checkout yourself, and gclient only manages the things specified in the DEPS file. So when you ran "gclient sync" it updated all of the dependencies, but didn't update your chromium/src.git checkout itself.

The instructions posted by Fabrice are essentially correct. I would recomment also taking a look at the tools in "man depot_tools" and "man depot_tools_tutorial". These give you an easy workflow to manage your branches without having to worry about manually updating from the remote repository all the time.

Aaron

--

[Primiano Tucci]

> I executed 'fetch chromium && gclient sync' and the issue went away.

So I assume at this point you got a brand new checkout from scratch?

> However, when I checkout my branch and merge from master, I get "Already up-to-date.".

Hmm what do you technically do? probably the main problem is that you got used to the managed mode, which is now deprecated, so in order to pull fresh code you have to do

git pull --rebase

before doing gclient sync

--

[Vadim Tryshev]

Thanks for your answers! But this didn't help.

I tried all the recommendations, and basically, nothing changed. When I switch to my branch and try merging or rebasing, I always get "branch is already up-to-date" message.

Perhaps, I have a wrong .gclient file?

(BTW, I'm on Windows, if this helps)

solutions = [{

  'name': 'src',

  'url': 'https://chromium.googlesource.com/chromium/src.git',

  'deps_file': '.DEPS.git',

  'managed': False,

  'custom_deps': {

    'src/third_party/WebKit/LayoutTests': None,

    'src/content/test/data/layout_tests/LayoutTests': None,

    'src/chrome_frame/tools/test/reference_build/chrome': None,

    'src/chrome_frame/tools/test/reference_build/chrome_win': None,

    'src/chrome/tools/test/reference_build/chrome': None,

    'src/chrome/tools/test/reference_build/chrome_linux': None,

    'src/chrome/tools/test/reference_build/chrome_mac': None,

    'src/chrome/tools/test/reference_build/chrome_win': None

  },

  'safesync_url': ''

}]

Also inline:

On Thu, Sep 11, 2014 at 3:08 AM, Primiano Tucci <prim...@chromium.org> wrote:

> I executed 'fetch chromium && gclient sync' and the issue went away.

So I assume at this point you got a brand new checkout from scratch?

Perhaps. It worked for a long time, and used network intensely. 

> However, when I checkout my branch and merge from master, I get "Already up-to-date.".

Hmm what do you technically do? probably the main problem is that you got used to the managed mode, which is now deprecated, so in order to pull fresh code you have to do

git pull --rebase

before doing gclient sync

Tried this too. 

[Erik Wright]

Remove the .DEPS.git reference from your .gclient file. I previously shared my experience getting caught by this parameter on this forum.

[Vadim Tryshev]

Removed. But it gets automatically re-added by "git pull --rebase && gclient sync".

BTW, I realized that I executed "fetch chromium" in my src dir, so it created a src/src dir. Now I deleted it, and removed .gclient from src, leaving it only in parent dir.

I tried creating another repository, and "git cl patch' my CL to it, but the patch failed because of conflicts.

However, I copied .gclient file from that new repository to my one, which didn't help.

Any other ideas?

--
Thank you!
Vadim