Maxime Chambreuil (http://www.savoirfairelinux.com) has proposed merging lp:~savoirfairelinux-openerp/bazaar-extractor/trunk-improve-shell-script into lp:bazaar-extractor.
Requested reviews: OpenERP Community Reviewer (openerp-community-reviewer) For more details, see: https://code.launchpad.net/~savoirfairelinux-openerp/bazaar-extractor/trunk-improve-shell-script/+merge/186950 -- https://code.launchpad.net/~savoirfairelinux-openerp/bazaar-extractor/trunk-improve-shell-script/+merge/186950 Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/bazaar-extractor/trunk-improve-shell-script.
=== added file 'README' --- README 1970-01-01 00:00:00 +0000 +++ README 2013-09-22 22:30:01 +0000 @@ -0,0 +1,6 @@ +README +###### + +Run bzr-replay.sh for more information on how to use it. + +The script has not been tested with multiple modules. === renamed file 'bzr-replay-readme.txt' => 'bzr-replay.sh' (properties changed: -x to +x) --- bzr-replay-readme.txt 2012-11-28 12:54:21 +0000 +++ bzr-replay.sh 2013-09-22 22:30:01 +0000 @@ -1,20 +1,45 @@ -#!bin/bash - - -mkdir $BRANCH_DEST_NAME +#!/bin/bash + +BRANCH_SRC_NAME=$1 +BRANCH_DEST_NAME=$2 +MODULE_LIST=$3 +LP_BRANCH_SRC_NAME=$4 +LP_BRANCH_DEST_NAME=$5 +REL_PATH=`dirname $0` +PATH_TO=`readlink -e $REL_PATH` + +if [ $# != 5 ]; then + echo "Usage: $0 BRANCH_SRC_NAME BRANCH_DEST_NAME MODULE_LIST LP_BRANCH_SRC_NAME LP_BRANCH_DEST_NAME" + exit 1 +fi + +if [ ! -d $BRANCH_DEST_NAME ]; then + mkdir -p $BRANCH_DEST_NAME + cd $BRANCH_DEST_NAME + bzr init . + cd - +fi + +SRC_ABS_PATH=`readlink -e $BRANCH_SRC_NAME` cd $BRANCH_DEST_NAME -bzr init . -ruby $PATH_TO/bzr-super-replay2.rb $BRANCH_SRC_NAME 1 --module $MODULE_LIST +bzr unbind +ruby $PATH_TO/bzr-super-replay.rb $SRC_ABS_PATH 1 --module $MODULE_LIST +cd - # Check diff +for MODULE in $MODULE_LIST; do + diff -r $BRANCH_SRC_NAME/$MODULE $BRANCH_DEST_NAME/$MODULE +done + # Push LP_BRANCH_DEST_NAME - cd $BRANCH_SRC_NAME bzr unbind bzr rm $MODULE_LIST -bzr ci -m"[DEL] Remove module cause we move them to LP_BRANCH_DEST_NAME. Module list: MODULE_LIST" +bzr ci -m "[DEL] Remove module cause we move them to $LP_BRANCH_DEST_NAME. Module list: $MODULE_LIST" bzr push $LP_BRANCH_SRC_NAME bzr bind $LP_BRANCH_SRC_NAME +exit 0 + # Warning: This is really brute force and still has some bugs. Don't forget to make a diff after using it to verify that nothing has been lost.
-- Mailing list: https://launchpad.net/~savoirfairelinux-openerp Post to : [email protected] Unsubscribe : https://launchpad.net/~savoirfairelinux-openerp More help : https://help.launchpad.net/ListHelp

