Confirmed users
657
edits
Mercurial Branch Merging: Difference between revisions
→Downstream Sync Workflow
| (4 intermediate revisions by 2 users not shown) | |||
| Line 8: | Line 8: | ||
hg pull mozilla-central | hg pull mozilla-central | ||
hg merge # | hg merge | ||
# if there are conflicts, fix them, and then issue `hg resolve -ma` | |||
hg commit -m "Merge mozilla-central and my-awesome-branch" | |||
hg push project-repo | hg push project-repo | ||
hg push mozilla-central | hg push mozilla-central | ||
| Line 21: | Line 23: | ||
hg pull http://hg.mozilla.org/mozilla-central/ | hg pull http://hg.mozilla.org/mozilla-central/ | ||
hg merge | hg merge | ||
# if there are conflicts, fix them, and then issue `hg resolve -ma` | |||
hg commit -m "Merge m-c onto project-repo" | hg commit -m "Merge m-c onto project-repo" | ||
hg push project-branch | |||
''via ehsan'' | ''via ehsan'' | ||
| Line 29: | Line 33: | ||
When a bug is fixed in a project repository, the fix is not available until it is merged upstream, so marking the bug as resolved is deceptive. The tracemonkey workflow for this is: | When a bug is fixed in a project repository, the fix is not available until it is merged upstream, so marking the bug as resolved is deceptive. The tracemonkey workflow for this is: | ||
# Create your patch using a personal repo | |||
# Get reviews (BEFORE landing on project repo; the rules don't change!) | |||
# Push the fix to the project repo | # Push the fix to the project repo | ||
# Add [fixed-in-tracemonkey] to the whiteboard | # Add [fixed-in-tracemonkey] to the whiteboard | ||
# Add a commit comment to the bug giving the commit's tracemonkey revision, eg http://hg.mozilla.org/tracemonkey/rev/ | # Add a commit comment to the bug giving the commit's tracemonkey revision, eg http://hg.mozilla.org/tracemonkey/rev/87dc60c12d24 | ||
# Do not mark the bug as resolved | # Do not mark the bug as resolved | ||