| author | Matt Harbison <matt_harbison@yahoo.com> |
| Fri, 30 Nov 2018 22:10:39 -0500 | |
| changeset 4283 | 5c707b54f8b1 |
| parent 3133 | 13a4c35f7a0b |
| child 5080 | 6db9e2350948 |
| permissions | -rwxr-xr-x |
|
3133
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
1 |
#!/bin/bash |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
2 |
set -euox pipefail |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
3 |
|
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
4 |
unset GREP_OPTIONS |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
5 |
NOTOPIC="--config experimental.topic-mode=ignore" |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
6 |
|
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
7 |
compatbranches=`hg branches --quiet | grep 'mercurial-' | grep -v ':' | sort -n --reverse` |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
8 |
prev='stable' |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
9 |
for branch in $compatbranches; do |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
10 |
hg up $branch |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
11 |
hg merge $prev |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
12 |
hg commit -m "test-compat: merge $prev into $branch" |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
13 |
prev=$branch |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
14 |
done |
|
13a4c35f7a0b
util: add a small script to help with the merging of branches
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
diff
changeset
|
15 |