Lines Matching +full:- +full:- +full:branch

4 creation of a branch in the perfetto repo, cherry-picking of the change(s) to
5 the branch, and updating the `DEPS` file in Chrome's milestone branch to point
6 to the new perfetto branch's head.
8 ## Creating the perfetto branch {#branch}
10 1.  Determine the branch name: **`chromium/XXXX`**, where `XXXX` is the branch
15 1.  Check if the branch already exists: if yes, skip to
16     [cherry-picking](#all-tables). To check, you can search for it in
17 …[Gerrit's branch page](https://android-review.googlesource.com/admin/repos/platform/external/perfe…
19 1.  Look up the appropriate base revision for the branch. You should use the
20     revision that Chromium's `DEPS` of the milestone branch points to (search
21     for `perfetto` in the file). The `DEPS` file for branch XXXX is at:
23     `https://chromium.googlesource.com/chromium/src.git/+/refs/branch-heads/XXXX/DEPS`
26     [`DEPS`](https://chromium.googlesource.com/chromium/src.git/+/refs/branch-heads/4280/DEPS)
29 1.  Create the branch - the easiest way to do this is via
30 …[Gerrit's branch page](https://android-review.googlesource.com/admin/repos/platform/external/perfe…
31     The `NEW BRANCH` button on the top right opens a wizard - fill in the branch
34     [perfetto-dev](https://groups.google.com/forum/#!forum/perfetto-dev) mailing
37 ## Cherry-picking the change(s) {#cherry-pick}
39 1.  If there are no merge conflicts, cherry-picking via Gerrit will be easiest.
41     in the overflow menu on the top right, providing the `chromium/XXXX` branch
42     name (see [above](#branch)).
44 1.  Otherwise, merge the patch locally into a branch tracking
49     $ git checkout -tb cpick origin/chromium/XXXX
50     $ git cherry-pick -x <commit hash>    # Resolve conflicts manually.
52     $ git cl upload    # Remove "Change-Id:" lines from commit message.
59 1.  Create, send for review, and land a Chromium patch that edits the top-level
60     `DEPS` file on the Chromium's milestone branch. You can also combine this
61     step with cherry-picks of any chromium changes. For details, see
62     [Chromium's docs](https://www.chromium.org/developers/how-tos/drover). It
66     $ gclient sync --with_branch_heads
68     $ git checkout -tb perfetto_uprev refs/remotes/branch-heads/XXXX