Mercurial > evolve
annotate contrib/merge-test-compat.sh @ 3576:89acae8f7e93
obsexchange: make compatible with some unreleased 4.5 versions
We don't generally care to be compatible with unreleased versions of
hg, but this is just a one-line change to be compatible with a range
of commits before 158d4ecc03c8 (wireprotoserver: move all wire
protocol handling logic out of hgweb, 2018-03-08), so hopefull it can
be worth it.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 19 Mar 2018 15:20:40 -0700 |
parents | 13a4c35f7a0b |
children | 6db9e2350948 |
rev | line source |
---|---|
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 |