Last active
August 29, 2015 14:02
-
-
Save yeukhon/00d25f354b6bf44eff0a to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
First time | |
hg pull -u | |
hg qnew bug1.patch | |
Next week, refresh latest before submitting my patch to bugzilla | |
hg qpop -a | |
hg pull -u | |
hg qpush <the patch i want> | |
Two weeks later, new bug | |
hg qpop -a | |
hg pull -u | |
hg qnew bug2.patch | |
Then 2 days later, I want to work on bug 2 part 2 | |
hg qpop -a | |
hg pull -u | |
hg qpush 0 --move | |
hg qnew bug2_part2.patch | |
How do I know it's qpush 0 or 1 or 2 or 3 | |
hg qseries -v tells you the number | |
Think of this as a stack of things. Push what you need by numbering. | |
The --move is preferred by me so I have control which patch is pushed. | |
If you have | |
0 | |
1 | |
2 | |
and you said qpush 1 you will also push 0 because it comes before 1. But if you add --move it will only push 1 | |
There will always be some merge conflict if your patch is too outdated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment