• Home
    • View
    • Login
    This page
    • Normal
    • Export PDF
    • Page Information

    Loading...
  1. Dashboard
  2. Undefined Space
  3. Build
  4. Submission Forests

Page History

Versions Compared

Old Version 38

changes.mady.by.user Brian Beck

Saved on Dec 05, 2016

compared with

New Version 39

changes.mady.by.user Brian Beck

Saved on Dec 05, 2016

  • Previous Change: Difference between versions 37 and 38
  • Next Change: Difference between versions 39 and 40
  • View Page History

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Once your branch has been integrated upstream, it will be closed automatically.  This is the common case.  Occasionally though, there may be a branch that needs to be abandoned.  This might happen when a branch has been pushed to the submission forest but  failed to integrate upstream.  Let's say you have a branch in the jdk repo that needs to be closed.  You could do the following:

Code Block
languagebash
$ # From the root of the forest
$ hg -R jdk update -C "JDK-7000001"
$ hg -R jdk commit --close-branch -m "Abandoning changes."
$ # Update repo to another branch to avoid mistakenly re-opening the closed branch.
$ hg -R jdk update default 

Note that for multi-repo fixes you need to close the branch in each repo where it exists andnot in any repo where it doesn't.  Solutions like the tree extension or the hgforest.sh script don't work well in this case.  It may be easiest to close each branch individually by hand.

Can I reuse a branch for a different fix?

...

Overview
Content Tools
ThemeBuilder

Terms of Use
• License: GPLv2
• Privacy • Trademarks • Contact Us

Powered by a free Atlassian Confluence Open Source Project License granted to https://www.atlassian.com/software/views/opensource-community-additional-license-offer. Evaluate Confluence today.

  • Kolekti ThemeBuilder Powered by Atlassian Confluence 8.5.21
  • Kolekti ThemeBuilder printed.by.atlassian.confluence
  • Report a bug
  • Atlassian News
Atlassian
Kolekti ThemeBuilder EngineAtlassian Confluence
{"serverDuration": 344, "requestCorrelationId": "077382a372fb0b4c"}