1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
Working with stack of patches Quick Reference
=============================================
Working on Firefox, we strongly recommend working with stack of patches.
Patches should be small and could be landed in the order used to push them.
This also helps to breakdown the work for different reviewers.
As it can be complex for new comers, this documentation explains the
various commands.
For the overall quick reference guide, see the :ref:`Firefox Contributors Quick Reference <Firefox Contributors' Quick Reference>`
Visualize the stack
-------------------
.. code-block:: shell
# Mercurial
$ hg wip
# Git
$ git log
Reorder the stack
-----------------
Sometimes, we want to change the order the patches in the stack.
Fortunately, VCS support this easily.
.. code-block:: shell
# Mercurial
# Just change the order the patch. The tool should highlight
# potential risks of conflicts.
# Note that ctrl+c works well if used
$ hg histedit
# Git
# In the editor, just move the line below/above
# Remove everything if you want to cancel the operation
$ git rebase -i
Make a change on a patch at the beginning of the stack
------------------------------------------------------
In some cases, the reviewer is asking for a change at the bottom of the stack (ie not at the top).
So, a simple `hg/git commit --amend` would not work.
In such case, the following approach can be used:
.. code-block:: shell
# Mercurial
# hg will try to guess in which an unambiguous prior commit
$ hg absorb
# if this doesn't work, create a temporary commit
# and merge it using "fold" or "roll"
$ hg histedit
# Git
$ git commit --fixup <hash of the commit>
Removing patches in the stack
-----------------------------
To remove a patch in the stack:
.. code-block:: shell
# Mercurial
# select "drop" (letter "d")
$ hg histedit
# Git
# Replace "pick" by "drop"
# Or simply remove the line for this commit
$ git rebase -i
Rebasing the stack
------------------
As the codebase moves fast, it can be necessary to pull changes from
mozilla-central before landing the changes.
.. code-block:: shell
# Mercurial
# First, see where your patches are in the stack
$ hg wip
# Then, rebase it:
# If you are a beginner, don't hesitate to add "--dry-run"
$ hg pull
$ hg rebase -b . -d central
# Git
$ git remote update
$ git rebase mozilla/central
|
