# Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information # regarding copyright ownership. The ASF licenses this file # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License.
rollback() {
EXIT="$?" if [ -n "$BASETIP" ]; then echo"Script failed for these heads"
hg heads echo"Script failed with exitcode $EXIT rolling back to $BASETIP"
hg update -C
hg --config extensions.mq= strip -n "$BASETIP"
hg pull -r "$BASETIP" else echo"No rollback, exitcode $EXIT" fi
}
hg heads
HEADS=`hg heads --template "{branches}\n" | grep "^$" | wc -l` if [ $HEADS = 2 ]; then echo"2 heads, Need to merge"
hg --config ui.merge=internal:merge --config ui.interactive=1 merge < /dev/null || exit 8
hg ci -u "$push_username"@netbeans.org -m "Automated merge with main-silver" else if [ $HEADS -gt 2 ]; then echo"$HEADS heads, here is some diagnostic"
hg heads fi fi