Skip to content

History / Rebasing our forks

Edit page New page

Revisions

  • rebasing our forks: Update the final sections. - We finally don't require changes to build-infrastructure anymore. - The contents after that mixed the next branch with master, and the instructions were either wrong or inconsistent. For now, mention only master; instructions about the next branch will be properly written later.

    @rakuco rakuco committed Jul 4, 2014
    b18332b

  • rebasing our forks: Update workflow for Chromium rebases. We now rebase on top of a git tag, which has the right DEPS and .DEPS.git files and does not need manual adjustment since we never go past the intended revision (which could happen when we rebased on top of a branch).

    @rakuco rakuco committed Jul 1, 2014
    2786736

  • rebasing our forks: Update variables referenced in DEPS.xwalk. We've fully migrated our dependencies to git recently. In the process, chromium_version was removed and the *_point variables were renamed to *_rev.

    @rakuco rakuco committed Jul 1, 2014
    c7a4210

  • rebasing our forks: Rework the "before you begin" checklist. - Stop mentioning ViewVC as we link to it in other sections anyway. - Mention the Chromium/Blink/V8 git mirrors more extensively and how SVN branches/tags map to their git counterparts.

    @rakuco rakuco committed Jul 1, 2014
    5d2a058

  • rebasing our forks: Stop mentioning the lkgr branch. We don't have any intentions of maintaining one for the foreseeable future.

    @rakuco rakuco committed Jul 1, 2014
    ed3096e

  • Updated Rebasing our forks (markdown)

    @darktears darktears committed Jun 30, 2014
    48e7f93

  • rebasing our forks: Add a section describing the work on ozone-wayland.

    @rakuco rakuco committed Jun 3, 2014
    0dbb58e

  • rebasing our forks: Rewrite the section about build-infrastructure. Adjust it to our current practices and describe the process to update the version numbers in more detail.

    @rakuco rakuco committed Jun 2, 2014
    82449db

  • rebasing our forks: Use the right keyword for syntax highlighting. It's sh, not shell.

    @rakuco rakuco committed Jun 2, 2014
    102bba4

  • rebasing our forks: Add instructions for v8-crosswalk.

    @rakuco rakuco committed Apr 9, 2014
    79c673d

  • rebasing our forks: Update the info on the buildbots. Update the list of people responsible for the infrastructure and which masters to change.

    @rakuco rakuco committed Apr 9, 2014
    e59cd6e

  • rebasing our forks: Simplify instructions for building and testing xwalk. The xwalk_builder target can build all tests besides Crosswalk itself, and there are other tests that were not mentioned before, so just say "and others".

    @rakuco rakuco committed Apr 9, 2014
    26379d6

  • rebasing our forks: Use better branch names. Our branch naming scheme has changed in the past few months, so adapt to that. For example, we don't keep upstream_* branches around anymore.

    @rakuco rakuco committed Apr 9, 2014
    754cc22

  • Updated Rebasing our forks (markdown)

    @darktears darktears committed Feb 3, 2014
    be582c8

  • Updated Rebasing our forks (markdown)

    @darktears darktears committed Feb 3, 2014
    4a5bd4d

  • Updated Rebasing our forks (markdown)

    @darktears darktears committed Jan 22, 2014
    7bb0e5f

  • Revert "Rebasing our forks: do not mention build-infrastructure.git anymore." The fix I committed needs more tuning, so we're back to where we were. This reverts commit 585ede18eb74daa1b81244d6437d1c17b8273d3a.

    @rakuco rakuco committed Jan 8, 2014
    fc426d7

  • Rebasing our forks: do not mention build-infrastructure.git anymore. The public buildbot infrastructure does not require one to update XWALK_CHROMIUM_VERSION anymore, and the try bots will hopefully follow.

    @rakuco rakuco committed Jan 3, 2014
    585ede1

  • Updated Rebasing our forks (markdown)

    Halton Huo committed Nov 7, 2013
    03014da

  • Updated Rebasing our forks (markdown)

    @jeez jeez committed Oct 7, 2013
    248bff8

  • Clarify that the DEPS in branches are not updated. We only touched the issue briefly in the "before you begin" section, but it is very important, so expand on the topic in the blink and chromium sections with proper examples and everything.

    @rakuco rakuco committed Oct 4, 2013
    2943052

  • Updated Rebasing our forks (markdown)

    @jeez jeez committed Oct 2, 2013
    689a481

  • Clarify the paragraph about shutting down the bots

    @rakuco rakuco committed Oct 2, 2013
    60d89c2

  • Use proper names instead of GitHub user names. The latter are not expanded to links :-(

    @rakuco rakuco committed Oct 2, 2013
    b3bfe9a

  • Use 'it' instead of 'there' to avoid repetition

    @rakuco rakuco committed Oct 2, 2013
    78ecb93

  • Add language hints in the code blocks for proper syntax highlighting

    @rakuco rakuco committed Oct 2, 2013
    5fc39cd

  • Move the "In other words" part in the branch names explanation. Put it into its own paragraph, it can be easily overlooked otherwise.

    @rakuco rakuco committed Oct 2, 2013
    b723a4d

  • Clarify which commits can be removed with git rebase -i.

    @rakuco rakuco committed Oct 2, 2013
    52d78e1

  • Rename Rebasing-chromium-crosswalk again. The article is not only about chromium-crosswalk; we also talk about blink-crosswalk and Crosswalk itself.

    @rakuco rakuco committed Oct 2, 2013
    73bbf06