From: <baz...@us...> - 2008-02-06 18:33:01
|
Revision: 7765 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7765&view=rev Author: bazaarmagetron Date: 2008-02-06 10:33:04 -0800 (Wed, 06 Feb 2008) Log Message: ----------- Made all.sh more flexible, adapted to accept branches outside of /armagetronad Modified Paths: -------------- tools/bzr/trunk/synctools/all.sh tools/bzr/trunk/synctools/config.sh tools/bzr/trunk/synctools/geturis.sh tools/bzr/trunk/synctools/mirror.cfg tools/bzr/trunk/synctools/sync.sh Added Paths: ----------- tools/bzr/trunk/.bzrignore Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info + timestamp: 2008-02-06 18:35:08.821000099 +0100 committer: darcsmaster <darcsmaster@beaker> properties: branch-nick: bzr Name: bzr:file-ids + .bzrignore bzrignore-20080206173215-181ouh1vhsg7hb84-1 Name: bzr:revision-id:v3-trunk2 + 7 darcsmaster@beaker-20080206173508-jjygawkw6gacyby2 Added: tools/bzr/trunk/.bzrignore =================================================================== --- tools/bzr/trunk/.bzrignore (rev 0) +++ tools/bzr/trunk/.bzrignore 2008-02-06 18:33:04 UTC (rev 7765) @@ -0,0 +1 @@ +branches Modified: tools/bzr/trunk/synctools/all.sh =================================================================== --- tools/bzr/trunk/synctools/all.sh 2008-02-06 17:45:11 UTC (rev 7764) +++ tools/bzr/trunk/synctools/all.sh 2008-02-06 18:33:04 UTC (rev 7765) @@ -29,7 +29,7 @@ fi } -cat mirror.cfg | som +cat "$@" | som rm .lock Modified: tools/bzr/trunk/synctools/config.sh =================================================================== --- tools/bzr/trunk/synctools/config.sh 2008-02-06 17:45:11 UTC (rev 7764) +++ tools/bzr/trunk/synctools/config.sh 2008-02-06 18:33:04 UTC (rev 7765) @@ -1,4 +1,4 @@ # configuration file for all branches BZRROOT=bzr+ssh://z-...@ba.../~armagetronad-dev/armagetronad -SVNROOT=https://armagetronad.svn.sourceforge.net/svnroot/armagetronad/armagetronad +SVNROOT=https://armagetronad.svn.sourceforge.net/svnroot/armagetronad Modified: tools/bzr/trunk/synctools/geturis.sh =================================================================== --- tools/bzr/trunk/synctools/geturis.sh 2008-02-06 17:45:11 UTC (rev 7764) +++ tools/bzr/trunk/synctools/geturis.sh 2008-02-06 18:33:04 UTC (rev 7765) @@ -1,6 +1,6 @@ # calculates URIs and other info from the $svnbranch variable -bzrbranch="$(echo $svnbranch | sed -e 's,/,-,g' | sed -e 's,^branches-,,')" +bzrbranch="$(echo $svnbranch | sed -e 's,/,-,g' | sed -e 's,^armagetronad-,,' | sed -e 's,^branches-,,')" bzrbranch_local="branches/$bzrbranch" bzrbranch_full="$BZRROOT/$bzrbranch"-work svnbranch_full="$SVNROOT/$svnbranch"/ Modified: tools/bzr/trunk/synctools/mirror.cfg =================================================================== --- tools/bzr/trunk/synctools/mirror.cfg 2008-02-06 17:45:11 UTC (rev 7764) +++ tools/bzr/trunk/synctools/mirror.cfg 2008-02-06 18:33:04 UTC (rev 7765) @@ -1,8 +1,9 @@ -branches/0.2.8/armagetronad -trunk/armagetronad -branches/0.2.8/build_eclipse -trunk/build_eclipse -branches/0.2.8/build -trunk/build -branches/0.2.8/winlibs -trunk/winlibs +tools/bzr/trunk +armagetronad/branches/0.2.8/armagetronad +armagetronad/trunk/armagetronad +armagetronad/branches/0.2.8/build_eclipse +armagetronad/trunk/build_eclipse +armagetronad/branches/0.2.8/build +armagetronad/trunk/build +armagetronad/branches/0.2.8/winlibs +armagetronad/trunk/winlibs Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-02-06 17:45:11 UTC (rev 7764) +++ tools/bzr/trunk/synctools/sync.sh 2008-02-06 18:33:04 UTC (rev 7765) @@ -48,7 +48,7 @@ echo Nothing to do. rm -f svnlog bzrlog exit 0 -done +fi rm -f svnlog bzrlog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-06 18:33:30
|
Revision: 7766 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7766&view=rev Author: bazaarmagetron Date: 2008-02-06 10:33:25 -0800 (Wed, 06 Feb 2008) Log Message: ----------- Fixed detection of pulls actually doing something; I was anticipating a different output. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-06 18:35:08.821000099 +0100 committer: darcsmaster <darcsmaster@beaker> properties: branch-nick: bzr + timestamp: 2008-02-06 18:42:44.848000050 +0100 committer: darcsmaster <darcsmaster@beaker> properties: branch-nick: bzr Name: bzr:file-ids - .bzrignore bzrignore-20080206173215-181ouh1vhsg7hb84-1 + Name: bzr:revision-id:v3-trunk2 - 7 darcsmaster@beaker-20080206173508-jjygawkw6gacyby2 + 7 darcsmaster@beaker-20080206173508-jjygawkw6gacyby2 8 darcsmaster@beaker-20080206174244-xxcvt26l65sq5rk9 Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-02-06 18:33:04 UTC (rev 7765) +++ tools/bzr/trunk/synctools/sync.sh 2008-02-06 18:33:25 UTC (rev 7766) @@ -44,7 +44,7 @@ set +x fi -if test -z "$(cat svnlog bzrlog | grep ^Pulled)"; then +if test -z "$(cat svnlog bzrlog | grep ^Now on)"; then echo Nothing to do. rm -f svnlog bzrlog exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-06 18:33:35
|
Revision: 7767 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7767&view=rev Author: bazaarmagetron Date: 2008-02-06 10:33:40 -0800 (Wed, 06 Feb 2008) Log Message: ----------- All right, now it really works. Modified Paths: -------------- tools/bzr/trunk/synctools/mirror.cfg tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-06 18:42:44.848000050 +0100 committer: darcsmaster <darcsmaster@beaker> properties: branch-nick: bzr + timestamp: 2008-02-06 18:53:33.312000036 +0100 committer: darcsmaster <darcsmaster@beaker> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk2 - 7 darcsmaster@beaker-20080206173508-jjygawkw6gacyby2 8 darcsmaster@beaker-20080206174244-xxcvt26l65sq5rk9 + 7 darcsmaster@beaker-20080206173508-jjygawkw6gacyby2 8 darcsmaster@beaker-20080206174244-xxcvt26l65sq5rk9 9 darcsmaster@beaker-20080206175333-bjsv5qbhjolwf5rg Modified: tools/bzr/trunk/synctools/mirror.cfg =================================================================== --- tools/bzr/trunk/synctools/mirror.cfg 2008-02-06 18:33:25 UTC (rev 7766) +++ tools/bzr/trunk/synctools/mirror.cfg 2008-02-06 18:33:40 UTC (rev 7767) @@ -1,4 +1,3 @@ -tools/bzr/trunk armagetronad/branches/0.2.8/armagetronad armagetronad/trunk/armagetronad armagetronad/branches/0.2.8/build_eclipse @@ -7,3 +6,4 @@ armagetronad/trunk/build armagetronad/branches/0.2.8/winlibs armagetronad/trunk/winlibs +tools/bzr/trunk Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-02-06 18:33:25 UTC (rev 7766) +++ tools/bzr/trunk/synctools/sync.sh 2008-02-06 18:33:40 UTC (rev 7767) @@ -44,7 +44,7 @@ set +x fi -if test -z "$(cat svnlog bzrlog | grep ^Now on)"; then +if test -z "$(cat svnlog bzrlog | grep '^Now on')"; then echo Nothing to do. rm -f svnlog bzrlog exit 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-06 18:33:54
|
Revision: 7768 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7768&view=rev Author: bazaarmagetron Date: 2008-02-06 10:33:56 -0800 (Wed, 06 Feb 2008) Log Message: ----------- Ignoring some more. Modified Paths: -------------- tools/bzr/trunk/.bzrignore Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-06 18:53:33.312000036 +0100 committer: darcsmaster <darcsmaster@beaker> properties: branch-nick: bzr + timestamp: 2008-02-06 18:54:31.529999971 +0100 committer: darcsmaster <darcsmaster@beaker> properties: branch-nick: bzr Name: bzr:revision-id:v3-trunk2 - 7 darcsmaster@beaker-20080206173508-jjygawkw6gacyby2 8 darcsmaster@beaker-20080206174244-xxcvt26l65sq5rk9 9 darcsmaster@beaker-20080206175333-bjsv5qbhjolwf5rg + 7 darcsmaster@beaker-20080206173508-jjygawkw6gacyby2 8 darcsmaster@beaker-20080206174244-xxcvt26l65sq5rk9 9 darcsmaster@beaker-20080206175333-bjsv5qbhjolwf5rg 10 darcsmaster@beaker-20080206175431-7vyen8w8euehhqxi Modified: tools/bzr/trunk/.bzrignore =================================================================== --- tools/bzr/trunk/.bzrignore 2008-02-06 18:33:40 UTC (rev 7767) +++ tools/bzr/trunk/.bzrignore 2008-02-06 18:33:56 UTC (rev 7768) @@ -1 +1,4 @@ branches +.lock +svnlog +bzrlog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-07 21:48:16
|
Revision: 7775 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7775&view=rev Author: bazaarmagetron Date: 2008-02-07 13:48:11 -0800 (Thu, 07 Feb 2008) Log Message: ----------- added Added Paths: ----------- tools/bzr/trunk/x Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-06 18:54:31.529999971 +0100 committer: darcsmaster <darcsmaster@beaker> properties: branch-nick: bzr + timestamp: 2008-02-07 17:17:53.665999889 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work Name: bzr:file-ids - + x x-20080207161747-fbvieztdfndx7p85-1 Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz Added: tools/bzr/trunk/x =================================================================== --- tools/bzr/trunk/x (rev 0) +++ tools/bzr/trunk/x 2008-02-07 21:48:11 UTC (rev 7775) @@ -0,0 +1 @@ +s This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-07 21:48:32
|
Revision: 7776 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7776&view=rev Author: bazaarmagetron Date: 2008-02-07 13:48:32 -0800 (Thu, 07 Feb 2008) Log Message: ----------- updated Modified Paths: -------------- tools/bzr/trunk/x Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-07 17:17:53.665999889 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work + timestamp: 2008-02-07 17:27:44.000999928 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work Name: bzr:file-ids - x x-20080207161747-fbvieztdfndx7p85-1 + Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd Modified: tools/bzr/trunk/x =================================================================== --- tools/bzr/trunk/x 2008-02-07 21:48:11 UTC (rev 7775) +++ tools/bzr/trunk/x 2008-02-07 21:48:32 UTC (rev 7776) @@ -1 +1,2 @@ s +updated This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-07 22:33:30
|
Revision: 7778 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7778&view=rev Author: bazaarmagetron Date: 2008-02-07 14:33:28 -0800 (Thu, 07 Feb 2008) Log Message: ----------- deleted test file Removed Paths: ------------- tools/bzr/trunk/x Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-07 17:27:44.000999928 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work + timestamp: 2008-02-07 23:01:45.862999916 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn Deleted: tools/bzr/trunk/x =================================================================== --- tools/bzr/trunk/x 2008-02-07 22:29:19 UTC (rev 7777) +++ tools/bzr/trunk/x 2008-02-07 22:33:28 UTC (rev 7778) @@ -1,2 +0,0 @@ -s -updated This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-07 22:33:58
|
Revision: 7779 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7779&view=rev Author: bazaarmagetron Date: 2008-02-07 14:33:59 -0800 (Thu, 07 Feb 2008) Log Message: ----------- The branch used for development of this went out of sync with SVN for branching scheme changes. Oh well. Here are the contents. Modified Paths: -------------- tools/bzr/trunk/synctools/README tools/bzr/trunk/synctools/config.sh tools/bzr/trunk/synctools/geturis.sh tools/bzr/trunk/synctools/mirror.sh tools/bzr/trunk/synctools/sync.sh Added Paths: ----------- tools/bzr/trunk/synctools/bzr-commit.sh tools/bzr/trunk/synctools/bzr-edit.sh tools/bzr/trunk/synctools/bzr-merge.sh tools/bzr/trunk/synctools/cron.sh tools/bzr/trunk/synctools/onemirror.cfg Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-07 23:01:45.862999916 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work + timestamp: 2008-02-07 23:10:08.970999956 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work Name: bzr:file-ids - + synctools/cron.sh cron.sh-20080207220513-ia7nz94u9sn2udin-4 synctools/bzr-edit.sh bzredit.sh-20080207220513-ia7nz94u9sn2udin-2 synctools/onemirror.cfg onemirror.cfg-20080207220513-ia7nz94u9sn2udin-5 synctools/bzr-commit.sh bzrcommit.sh-20080207220513-ia7nz94u9sn2udin-1 synctools/bzr-merge.sh bzrmerge.sh-20080207220513-ia7nz94u9sn2udin-3 Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm Modified: tools/bzr/trunk/synctools/README =================================================================== --- tools/bzr/trunk/synctools/README 2008-02-07 22:33:28 UTC (rev 7778) +++ tools/bzr/trunk/synctools/README 2008-02-07 22:33:59 UTC (rev 7779) @@ -16,3 +16,17 @@ There are also the individual scripts mirror.sh and sync.sh that let you mirror an svn branch and keep it in sync. + +The branching scheme you should set with +"bzr svn-branching-scheme https://armagetronad.svn.sourceforge.net/svnroot/armagetronad --set" + +is: +*/trunk/* +*/branches/*/* +*/tags/*/* +tools/*/trunk + +It also pays to do a dry run first with a local copy of the SF SVN +repository. The intial pull and push from there take quite a while. +You can delete the resulting branches afterwards; the important thing +is that your cache in ~/.bazaar/svn-cache is filled. Added: tools/bzr/trunk/synctools/bzr-commit.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-commit.sh (rev 0) +++ tools/bzr/trunk/synctools/bzr-commit.sh 2008-02-07 22:33:59 UTC (rev 7779) @@ -0,0 +1,11 @@ +#!/bin/bash + +# bend editor to script that copies merge metadata into commit message +test -z "$EDITOR" && EDITOR=editor +export ORIGINAL_EDITOR=$EDITOR +export EDITOR="$(dirname $0)/bzr-edit.sh" + +# and commit +bzr commit + + Property changes on: tools/bzr/trunk/synctools/bzr-commit.sh ___________________________________________________________________ Name: svn:executable + * Added: tools/bzr/trunk/synctools/bzr-edit.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-edit.sh (rev 0) +++ tools/bzr/trunk/synctools/bzr-edit.sh 2008-02-07 22:33:59 UTC (rev 7779) @@ -0,0 +1,21 @@ +#!/bin/bash + +# make backup of message +mv "$1" "$1.back" + +# add newline +echo > "$1" + +# paste merge information +PENDING="^pending merges:" +grep "$PENDING" < "$1.back" -A 2000000 | sed -e "s/$PENDING/merging:/" >> "$1" + +# and append regular message +grep "\-" < "$1.back" -A 2000000 >> "$1" + +# remove traces +rm -f "$1.back" + +# call original editor +$ORIGINAL_EDITOR "$@" + Property changes on: tools/bzr/trunk/synctools/bzr-edit.sh ___________________________________________________________________ Name: svn:executable + * Added: tools/bzr/trunk/synctools/bzr-merge.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-merge.sh (rev 0) +++ tools/bzr/trunk/synctools/bzr-merge.sh 2008-02-07 22:33:59 UTC (rev 7779) @@ -0,0 +1,10 @@ +#!/bin/bash + +# try to fetch changes +bzr pull "$@" && exit 0 + +# merge them if required +bzr merge "$@" || exit 1 + +# commit directly if there are no conflicts +$(dirname $0)/bzr-commit.sh Property changes on: tools/bzr/trunk/synctools/bzr-merge.sh ___________________________________________________________________ Name: svn:executable + * Modified: tools/bzr/trunk/synctools/config.sh =================================================================== --- tools/bzr/trunk/synctools/config.sh 2008-02-07 22:33:28 UTC (rev 7778) +++ tools/bzr/trunk/synctools/config.sh 2008-02-07 22:33:59 UTC (rev 7779) @@ -2,3 +2,6 @@ BZRROOT=bzr+ssh://z-...@ba.../~armagetronad-dev/armagetronad SVNROOT=https://armagetronad.svn.sourceforge.net/svnroot/armagetronad +#SVNROOT=file:///home/darcsmaster/armagetron/svn/mirror/svn +#SVNROOT=svn+ssh://darcsmaster@proxy/home/darcsmaster/armagetron/svn/mirror/svn +#BZRROOT=/home/darcsmaster/armagetron/launchpad2 Added: tools/bzr/trunk/synctools/cron.sh =================================================================== --- tools/bzr/trunk/synctools/cron.sh (rev 0) +++ tools/bzr/trunk/synctools/cron.sh 2008-02-07 22:33:59 UTC (rev 7779) @@ -0,0 +1,12 @@ +#!/bin/bash + +# usage: cron.sh + +# to be called as cronjob + +cd $(dirname $0) + +# execute syncing, only print on error +mkdir -p logs +log="logs/$(date)" +nice -n 5 ./all.sh mirror.cfg > "${log}" 2>&1 || cat "${log} Property changes on: tools/bzr/trunk/synctools/cron.sh ___________________________________________________________________ Name: svn:executable + * Modified: tools/bzr/trunk/synctools/geturis.sh =================================================================== --- tools/bzr/trunk/synctools/geturis.sh 2008-02-07 22:33:28 UTC (rev 7778) +++ tools/bzr/trunk/synctools/geturis.sh 2008-02-07 22:33:59 UTC (rev 7779) @@ -1,5 +1,6 @@ # calculates URIs and other info from the $svnbranch variable +#set -x bzrbranch="$(echo $svnbranch | sed -e 's,/,-,g' | sed -e 's,^armagetronad-,,' | sed -e 's,^branches-,,')" bzrbranch_local="branches/$bzrbranch" bzrbranch_full="$BZRROOT/$bzrbranch"-work Modified: tools/bzr/trunk/synctools/mirror.sh =================================================================== --- tools/bzr/trunk/synctools/mirror.sh 2008-02-07 22:33:28 UTC (rev 7778) +++ tools/bzr/trunk/synctools/mirror.sh 2008-02-07 22:33:59 UTC (rev 7779) @@ -32,6 +32,9 @@ bzr branch "${bzrbranch_local}-sync" "${bzrbranch_local}-work" || exit 1 echo pushing work branch to remote URI... -bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}" || exit 1 + bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}" || exit 1 +echo making backup of successful operation... +bzr branch "${bzrbranch_local}-sync" "${bzrbranch_local}-backup" || exit 1 + echo done! Added: tools/bzr/trunk/synctools/onemirror.cfg =================================================================== --- tools/bzr/trunk/synctools/onemirror.cfg (rev 0) +++ tools/bzr/trunk/synctools/onemirror.cfg 2008-02-07 22:33:59 UTC (rev 7779) @@ -0,0 +1,2 @@ +private/z-man/test/bzr/trunk + Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-02-07 22:33:28 UTC (rev 7778) +++ tools/bzr/trunk/synctools/sync.sh 2008-02-07 22:33:59 UTC (rev 7779) @@ -25,56 +25,69 @@ echo syncing branch $svnbranch: +workdir=$(pwd) + +lastsuccess=true +test -r "${bzrbranch_local}-error" && lastsuccess=false +touch "${bzrbranch_local}-error" + echo pulling changes from svn... -bzr pull -d "${bzrbranch_local}-sync" "${svnbranch_full}" | tee svnlog || exit 1 +if ! bzr pull -d "${bzrbranch_local}-sync" "${svnbranch_full}" > svnlog; then + cat svnlog + echo perhaps this helps: rebasing sync branch to svn... + set -x + pushd "${bzrbranch_local}-sync" > /dev/null + bzr rebase "${svnbranch_full}" || exit 1 + popd > /dev/null + echo retry: pulling changes from svn... + bzr pull -d "${bzrbranch_local}-sync" "${svnbranch_full}" > svnlog || exit 1 + set +x +fi +cat svnlog -echo pulling changes from remote bzr work branch... -if ! bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_full}" | tee bzrlog; then - echo Errors encountered during remote pulling. Someone probably has pushed changes to \"${bzrbranch_full}\" without rebasing. Shame on him. - echo Trying to automatically resolve the errors by repeated rebasing. - set -x - bzr branch "${bzrbranch_local}-work" "${bzrbranch_local}-fix" || exit 1 - pushd "${bzrbranch_local}-fix" - bzr rebase "${bzrbranch_full}" || exit 1 - bzr merge --pull "${bzrbranch_full}" || exit 1 - bzr rebase "../${bzrbranch}-sync" || exit 1 - popd - bzr push "${bzrbranch_local}-fix" "${bzrbranch_full}" || exit 1 - bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_full}" || exit 1 - set +x +if ! test -z "$(cat svnlog | grep '^Now on')" || test ${lastsuccess} = false; then + echo pulling changes from sync to work branch... + if ! bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync"; then + echo perhaps this helps: rebasing work branch to sync branch... + set -x + pushd "${bzrbranch_local}-work" > /dev/null + bzr rebase "${workdir}/${bzrbranch_local}-sync" || exit 1 + popd > /dev/null + echo retry: pulling changes from sync to work branch... + bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 + set +x + fi fi -if test -z "$(cat svnlog bzrlog | grep '^Now on')"; then +echo pulling changes from remote bzr work branch... +pushd "${bzrbranch_local}-work" > /dev/null +EDITOR="echo" ${workdir}/$(dirname $0)/bzr-merge.sh "${bzrbranch_full}" > ${workdir}/bzrlog || exit 1 +popd > /dev/null +cat bzrlog + +if test -z "$(cat svnlog bzrlog | grep '^Now on')" && test ${lastsuccess} = true; then echo Nothing to do. - rm -f svnlog bzrlog - exit 0 + rm -f svnlog bzrlog "${bzrbranch_local}-error" + #exit 0 fi rm -f svnlog bzrlog -echo pulling from synced branch to work branch... -if ! bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync"; then - echo rebasing local work branch... - pushd "${bzrbranch_local}-work" 2>&1 > /dev/null - if ! bzr rebase "${bzrbranch_local}-sync"; then - echo - echo Errors encountered during rebasing. Please correct them, finish the rebase with \"bzr rebase-continue\", then call \"sync.sh $1\" again. - exit 1 - fi - echo - popd 2>&1 >/dev/null - - echo pulling from synced branch to work branch again... - bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 -fi - echo pushing work branch to remote bzr branch... bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}" || exit 1 -echo pulling changes to sync branch... -bzr pull -d "${bzrbranch_local}-sync" "${bzrbranch_local}-work" || exit 1 +echo pulling work branch to sync branch... +bzr push -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 echo pushing sync branch to SVN... bzr push -d "${bzrbranch_local}-sync" "${svnbranch_full}" || exit 1 +echo making backup of successful operation... +if test -d "${bzrbranch_local}-backup"; then + bzr pull -d "${bzrbranch_local}-backup" "${bzrbranch_local}-sync" || exit 1 +else + bzr branch "${bzrbranch_local}-sync" "${bzrbranch_local}-backup" || exit 1 +fi + echo done! +rm -f "${bzrbranch_local}-error" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-07 22:34:21
|
Revision: 7780 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7780&view=rev Author: bazaarmagetron Date: 2008-02-07 14:34:19 -0800 (Thu, 07 Feb 2008) Log Message: ----------- Actually abort if there is nothing to do. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-07 23:10:08.970999956 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work + timestamp: 2008-02-07 23:12:23.345000029 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work Name: bzr:file-ids - synctools/cron.sh cron.sh-20080207220513-ia7nz94u9sn2udin-4 synctools/bzr-edit.sh bzredit.sh-20080207220513-ia7nz94u9sn2udin-2 synctools/onemirror.cfg onemirror.cfg-20080207220513-ia7nz94u9sn2udin-5 synctools/bzr-commit.sh bzrcommit.sh-20080207220513-ia7nz94u9sn2udin-1 synctools/bzr-merge.sh bzrmerge.sh-20080207220513-ia7nz94u9sn2udin-3 + Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-02-07 22:33:59 UTC (rev 7779) +++ tools/bzr/trunk/synctools/sync.sh 2008-02-07 22:34:19 UTC (rev 7780) @@ -68,7 +68,7 @@ if test -z "$(cat svnlog bzrlog | grep '^Now on')" && test ${lastsuccess} = true; then echo Nothing to do. rm -f svnlog bzrlog "${bzrbranch_local}-error" - #exit 0 + exit 0 fi rm -f svnlog bzrlog This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-08 00:27:57
|
Revision: 7781 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7781&view=rev Author: bazaarmagetron Date: 2008-02-07 16:28:00 -0800 (Thu, 07 Feb 2008) Log Message: ----------- added a way to request sync processes. Added Paths: ----------- tools/bzr/trunk/synctools/bzr-run-in-loop.sh tools/bzr/trunk/synctools/bzr-wait-for-commit.sh tools/bzr/trunk/synctools/request-sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-07 23:12:23.345000029 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work + timestamp: 2008-02-08 01:19:47.999000072 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: bzr Name: bzr:file-ids - + synctools/bzr-run-in-loop.sh bzrruninloop.sh-20080208001921-g2aqc1ctbjsr7tnx-1 synctools/bzr-wait-for-commit.sh bzrwaitforcommit.sh-20080208001921-g2aqc1ctbjsr7tnx-2 synctools/request-sync.sh requestsync.sh-20080208001921-g2aqc1ctbjsr7tnx-3 Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy Added: tools/bzr/trunk/synctools/bzr-run-in-loop.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-run-in-loop.sh (rev 0) +++ tools/bzr/trunk/synctools/bzr-run-in-loop.sh 2008-02-08 00:28:00 UTC (rev 7781) @@ -0,0 +1,11 @@ +#!/bin/bash + +# runs sync in loop; new sync can be triggered by ./request-sync.sh + + cd $(dirname $0) + +while true; do + ./bzr-wait-for-commit.sh + touch .pleasewait + ./all.sh mirror.cfg +done Property changes on: tools/bzr/trunk/synctools/bzr-run-in-loop.sh ___________________________________________________________________ Name: svn:executable + * Added: tools/bzr/trunk/synctools/bzr-wait-for-commit.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-wait-for-commit.sh (rev 0) +++ tools/bzr/trunk/synctools/bzr-wait-for-commit.sh 2008-02-08 00:28:00 UTC (rev 7781) @@ -0,0 +1,10 @@ +#!/bin/bash + +# waits for a commit from svn/bzr. + +cd $(dirname $0) + +if test -r .pleasewait; then + rm -f .pleasewait + sleep 3600 +fi Property changes on: tools/bzr/trunk/synctools/bzr-wait-for-commit.sh ___________________________________________________________________ Name: svn:executable + * Added: tools/bzr/trunk/synctools/request-sync.sh =================================================================== --- tools/bzr/trunk/synctools/request-sync.sh (rev 0) +++ tools/bzr/trunk/synctools/request-sync.sh 2008-02-08 00:28:00 UTC (rev 7781) @@ -0,0 +1,9 @@ +#!/bin/bash + +# requests a bzr-svn sync + +cd $(dirname $0) + +rm -f .pleasewait +killall -KILL bzr-wait-for-commit.sh + Property changes on: tools/bzr/trunk/synctools/request-sync.sh ___________________________________________________________________ Name: svn:executable + * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-08 02:08:54
|
Revision: 7782 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7782&view=rev Author: bazaarmagetron Date: 2008-02-07 18:08:59 -0800 (Thu, 07 Feb 2008) Log Message: ----------- Underlined heading. Just testing the sync trigger :) Modified Paths: -------------- tools/bzr/trunk/synctools/README Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-08 01:19:47.999000072 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: bzr + timestamp: 2008-02-08 03:01:01.628000021 +0100 committer: manuel <manuel@gonzo> properties: branch-nick: tools-bzr-trunk-work Name: bzr:file-ids - synctools/bzr-run-in-loop.sh bzrruninloop.sh-20080208001921-g2aqc1ctbjsr7tnx-1 synctools/bzr-wait-for-commit.sh bzrwaitforcommit.sh-20080208001921-g2aqc1ctbjsr7tnx-2 synctools/request-sync.sh requestsync.sh-20080208001921-g2aqc1ctbjsr7tnx-3 + Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn Modified: tools/bzr/trunk/synctools/README =================================================================== --- tools/bzr/trunk/synctools/README 2008-02-08 00:28:00 UTC (rev 7781) +++ tools/bzr/trunk/synctools/README 2008-02-08 02:08:59 UTC (rev 7782) @@ -1,4 +1,5 @@ BZR <-> SVN Syncing tools +------------------------- How to operate: Edit config.sh to set the roots of the bzr and svn repositories. bzr and svn This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-08 02:15:51
|
Revision: 7783 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7783&view=rev Author: bazaarmagetron Date: 2008-02-07 18:15:56 -0800 (Thu, 07 Feb 2008) Log Message: ----------- Increased loop time. Modified Paths: -------------- tools/bzr/trunk/synctools/bzr-wait-for-commit.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-08 03:01:01.628000021 +0100 committer: manuel <manuel@gonzo> properties: branch-nick: tools-bzr-trunk-work + timestamp: 2008-02-08 03:11:35.456000090 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 Modified: tools/bzr/trunk/synctools/bzr-wait-for-commit.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-wait-for-commit.sh 2008-02-08 02:08:59 UTC (rev 7782) +++ tools/bzr/trunk/synctools/bzr-wait-for-commit.sh 2008-02-08 02:15:56 UTC (rev 7783) @@ -6,5 +6,5 @@ if test -r .pleasewait; then rm -f .pleasewait - sleep 3600 + sleep 7200 fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-08 12:11:42
|
Revision: 7795 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7795&view=rev Author: bazaarmagetron Date: 2008-02-08 04:11:45 -0800 (Fri, 08 Feb 2008) Log Message: ----------- Adapted to the fact that it is simply called from .procmail without arguments. Modified Paths: -------------- tools/bzr/trunk/synctools/request-sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-08 03:11:35.456000090 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work + timestamp: 2008-02-08 13:03:20.055999994 +0100 committer: bazaarmagetron <z-...@us...> properties: branch-nick: bzr Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb Modified: tools/bzr/trunk/synctools/request-sync.sh =================================================================== --- tools/bzr/trunk/synctools/request-sync.sh 2008-02-08 11:52:08 UTC (rev 7794) +++ tools/bzr/trunk/synctools/request-sync.sh 2008-02-08 12:11:45 UTC (rev 7795) @@ -4,6 +4,13 @@ cd $(dirname $0) +#if test "$(line)" != "BZR-SVN-SYNC"; then +# echo "WRONG COMMAND" +# exit +#fi + +echo "TRIGGERING SYNC" + rm -f .pleasewait killall -KILL bzr-wait-for-commit.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-08 12:12:04
|
Revision: 7796 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7796&view=rev Author: bazaarmagetron Date: 2008-02-08 04:12:04 -0800 (Fri, 08 Feb 2008) Log Message: ----------- Better reshuffling of simultaneous commits in SVN and bzr. Modified Paths: -------------- tools/bzr/trunk/synctools/bzr-commit.sh tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-08 13:03:20.055999994 +0100 committer: bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2008-02-08 13:04:16.960999966 +0100 committer: bazaarmagetron <z-...@us...> properties: branch-nick: bzr Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba Modified: tools/bzr/trunk/synctools/bzr-commit.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-commit.sh 2008-02-08 12:11:45 UTC (rev 7795) +++ tools/bzr/trunk/synctools/bzr-commit.sh 2008-02-08 12:12:04 UTC (rev 7796) @@ -6,6 +6,9 @@ export EDITOR="$(dirname $0)/bzr-edit.sh" # and commit -bzr commit +if test -z "$(bzr diff)"; then + bzr commit -m "Empty merge to keep the peace between svn and bzr." +else + bzr commit +fi - Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-02-08 12:11:45 UTC (rev 7795) +++ tools/bzr/trunk/synctools/sync.sh 2008-02-08 12:12:04 UTC (rev 7796) @@ -45,20 +45,6 @@ fi cat svnlog -if ! test -z "$(cat svnlog | grep '^Now on')" || test ${lastsuccess} = false; then - echo pulling changes from sync to work branch... - if ! bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync"; then - echo perhaps this helps: rebasing work branch to sync branch... - set -x - pushd "${bzrbranch_local}-work" > /dev/null - bzr rebase "${workdir}/${bzrbranch_local}-sync" || exit 1 - popd > /dev/null - echo retry: pulling changes from sync to work branch... - bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 - set +x - fi -fi - echo pulling changes from remote bzr work branch... pushd "${bzrbranch_local}-work" > /dev/null EDITOR="echo" ${workdir}/$(dirname $0)/bzr-merge.sh "${bzrbranch_full}" > ${workdir}/bzrlog || exit 1 @@ -73,8 +59,28 @@ rm -f svnlog bzrlog +echo pulling changes from sync to work branch... +if ! bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync"; then + echo perhaps this helps: rebasing work branch to sync branch... + set -x + pushd "${bzrbranch_local}-work" > /dev/null + bzr rebase "${workdir}/${bzrbranch_local}-sync" || exit 1 + popd > /dev/null + echo retry: pulling changes from sync to work branch... + bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 + set +x +fi + echo pushing work branch to remote bzr branch... -bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}" || exit 1 +if ! bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}"; then + echo merging changes from remote bzr work branch... + pushd "${bzrbranch_local}-work" > /dev/null + bzr merge "${bzrbranch_full}" || exit 1 + EDITOR="echo" ${workdir}/$(dirname $0)/bzr-commit.sh || exit 1 + popd > /dev/null + echo retrying the push... + bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}" || exit -1 +fi echo pulling work branch to sync branch... bzr push -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-08 12:12:20
|
Revision: 7797 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7797&view=rev Author: bazaarmagetron Date: 2008-02-08 04:12:26 -0800 (Fri, 08 Feb 2008) Log Message: ----------- Ignoring more stuff. Modified Paths: -------------- tools/bzr/trunk/.bzrignore Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-08 13:04:16.960999966 +0100 committer: bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2008-02-08 13:06:11.865999937 +0100 committer: bazaarmagetron <z-...@us...> properties: branch-nick: bzr Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 Modified: tools/bzr/trunk/.bzrignore =================================================================== --- tools/bzr/trunk/.bzrignore 2008-02-08 12:12:04 UTC (rev 7796) +++ tools/bzr/trunk/.bzrignore 2008-02-08 12:12:26 UTC (rev 7797) @@ -2,3 +2,7 @@ .lock svnlog bzrlog +branches +.pleasewait +.lock +logs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-10 14:33:39
|
Revision: 7841 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7841&view=rev Author: bazaarmagetron Date: 2008-02-10 06:33:41 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Refined way changed history order in the remote branch is handled: it is merged in now and does not alter SVN history. Modified Paths: -------------- tools/bzr/trunk/synctools/bzr-edit.sh tools/bzr/trunk/synctools/mirror.sh tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-08 13:06:11.865999937 +0100 committer: bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2008-02-10 15:24:02.447000027 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze Modified: tools/bzr/trunk/synctools/bzr-edit.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-edit.sh 2008-02-10 13:43:18 UTC (rev 7840) +++ tools/bzr/trunk/synctools/bzr-edit.sh 2008-02-10 14:33:41 UTC (rev 7841) @@ -8,10 +8,14 @@ # paste merge information PENDING="^pending merges:" -grep "$PENDING" < "$1.back" -A 2000000 | sed -e "s/$PENDING/merging:/" >> "$1" +echo -n "merging:" >> "$1" +grep "$PENDING" < "$1.back" -A 2000000 | grep -v "$PENDING" >> "$1" +# add newline +echo >> "$1" + # and append regular message -grep "\-" < "$1.back" -A 2000000 >> "$1" +grep "\-\-\-\-" < "$1.back" -A 2000000 >> "$1" # remove traces rm -f "$1.back" Modified: tools/bzr/trunk/synctools/mirror.sh =================================================================== --- tools/bzr/trunk/synctools/mirror.sh 2008-02-10 13:43:18 UTC (rev 7840) +++ tools/bzr/trunk/synctools/mirror.sh 2008-02-10 14:33:41 UTC (rev 7841) @@ -36,5 +36,6 @@ echo making backup of successful operation... bzr branch "${bzrbranch_local}-sync" "${bzrbranch_local}-backup" || exit 1 +bzr log "${bzrbranch_local}-backup" > "${bzrbranch_local}-backup-log" || exit 1 echo done! Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-02-10 13:43:18 UTC (rev 7840) +++ tools/bzr/trunk/synctools/sync.sh 2008-02-10 14:33:41 UTC (rev 7841) @@ -59,16 +59,37 @@ rm -f svnlog bzrlog -echo pulling changes from sync to work branch... -if ! bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync"; then - echo perhaps this helps: rebasing work branch to sync branch... +echo logging work branch... +bzr log "${bzrbranch_local}-work" > "${bzrbranch_local}-work-log" || exit 1 + +# check whether the log from the remote branch has only added items relative +# to the last backup. +if diff "${bzrbranch_local}-work-log" "${bzrbranch_local}-backup-log" | grep "^>" > /dev/null; then + echo "Remote branch revision order has changed. Doctor, we need to operate!" + echo "merging changes from work to sync branch (instead of just pulling)..." set -x - pushd "${bzrbranch_local}-work" > /dev/null - bzr rebase "${workdir}/${bzrbranch_local}-sync" || exit 1 - popd > /dev/null - echo retry: pulling changes from sync to work branch... - bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 + pushd "${bzrbranch_local}-sync" > /dev/null + bzr merge "${workdir}/${bzrbranch_local}-work" || exit 1 + EDITOR="echo" ${workdir}/$(dirname $0)/bzr-commit.sh || exit 1 + echo pushing changes from sync to work branch... + bzr push "${workdir}/${bzrbranch_local}-work" || exit 1 + popd set +x +else + echo pulling changes from sync to work branch... + if ! bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync"; then + echo perhaps this helps: rebasing work branch to sync branch... + set -x + pushd "${bzrbranch_local}-work" > /dev/null + bzr rebase "${workdir}/${bzrbranch_local}-sync" || exit 1 + popd > /dev/null + echo retry: pulling changes from sync to work branch... + bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 + set +x + fi + + echo pulling work branch to sync branch... + bzr push -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 fi echo pushing work branch to remote bzr branch... @@ -82,9 +103,6 @@ bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}" || exit -1 fi -echo pulling work branch to sync branch... -bzr push -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 - echo pushing sync branch to SVN... bzr push -d "${bzrbranch_local}-sync" "${svnbranch_full}" || exit 1 @@ -94,6 +112,7 @@ else bzr branch "${bzrbranch_local}-sync" "${bzrbranch_local}-backup" || exit 1 fi +bzr log "${bzrbranch_local}-backup" > "${bzrbranch_local}-backup-log" || exit 1 echo done! rm -f "${bzrbranch_local}-error" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-10 15:39:07
|
Revision: 7843 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7843&view=rev Author: bazaarmagetron Date: 2008-02-10 07:39:12 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Better merge messages, they now contain the complete log. Modified Paths: -------------- tools/bzr/trunk/synctools/bzr-merge.sh tools/bzr/trunk/synctools/sync.sh Added Paths: ----------- tools/bzr/trunk/synctools/bzr-autocommit.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-10 15:24:02.447000027 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work + timestamp: 2008-02-10 16:30:17.400000095 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work Name: bzr:file-ids - + synctools/bzr-autocommit.sh bzrautocommit.sh-20080210153001-xuwi8ok3ivxd2sle-1 Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 Added: tools/bzr/trunk/synctools/bzr-autocommit.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-autocommit.sh (rev 0) +++ tools/bzr/trunk/synctools/bzr-autocommit.sh 2008-02-10 15:39:12 UTC (rev 7843) @@ -0,0 +1,24 @@ +#!/bin/bash + +# commits merges with a meaningful message. + +if test -z "$(bzr diff)"; then + bzr commit -m "Empty merge to keep the peace between svn and bzr." +else + tmp=$(tempfile) + msg="MERGING${tmp}": + + # commit once to get a good log + bzr commit -m "${msg}" + msg="^ *${msg}" + echo "Automatic merging of commits that would change history order:" > ${tmp} + bzr log -r revno:-1 | grep "${msg}" -A 2000000 | grep -v "${msg}" | sed -e "s,^ ,," >> ${tmp} + + # undo the commit + bzr uncommit --force > /dev/null + + # and repeat it with the log message + bzr commit -F ${tmp} + rm ${tmp} +fi + Property changes on: tools/bzr/trunk/synctools/bzr-autocommit.sh ___________________________________________________________________ Name: svn:executable + * Modified: tools/bzr/trunk/synctools/bzr-merge.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-merge.sh 2008-02-10 14:53:47 UTC (rev 7842) +++ tools/bzr/trunk/synctools/bzr-merge.sh 2008-02-10 15:39:12 UTC (rev 7843) @@ -7,4 +7,4 @@ bzr merge "$@" || exit 1 # commit directly if there are no conflicts -$(dirname $0)/bzr-commit.sh +$(dirname $0)/bzr-autocommit.sh Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-02-10 14:53:47 UTC (rev 7842) +++ tools/bzr/trunk/synctools/sync.sh 2008-02-10 15:39:12 UTC (rev 7843) @@ -47,7 +47,7 @@ echo pulling changes from remote bzr work branch... pushd "${bzrbranch_local}-work" > /dev/null -EDITOR="echo" ${workdir}/$(dirname $0)/bzr-merge.sh "${bzrbranch_full}" > ${workdir}/bzrlog || exit 1 +${workdir}/$(dirname $0)/bzr-merge.sh "${bzrbranch_full}" > ${workdir}/bzrlog || exit 1 popd > /dev/null cat bzrlog @@ -70,7 +70,7 @@ set -x pushd "${bzrbranch_local}-sync" > /dev/null bzr merge "${workdir}/${bzrbranch_local}-work" || exit 1 - EDITOR="echo" ${workdir}/$(dirname $0)/bzr-commit.sh || exit 1 + ${workdir}/$(dirname $0)/bzr-autocommit.sh || exit 1 echo pushing changes from sync to work branch... bzr push "${workdir}/${bzrbranch_local}-work" || exit 1 popd @@ -97,7 +97,7 @@ echo merging changes from remote bzr work branch... pushd "${bzrbranch_local}-work" > /dev/null bzr merge "${bzrbranch_full}" || exit 1 - EDITOR="echo" ${workdir}/$(dirname $0)/bzr-commit.sh || exit 1 + ${workdir}/$(dirname $0)/bzr-autocommit.sh || exit 1 popd > /dev/null echo retrying the push... bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}" || exit -1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-10 17:22:44
|
Revision: 7844 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7844&view=rev Author: bazaarmagetron Date: 2008-02-10 09:22:48 -0800 (Sun, 10 Feb 2008) Log Message: ----------- BZR-Committer: Manuel Moos <z-...@us...> Optimization: Only syncing branches affected by changes; that information is parsed from the notification mail messages. Modified Paths: -------------- tools/bzr/trunk/synctools/all.sh tools/bzr/trunk/synctools/request-sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-10 16:30:17.400000095 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work + timestamp: 2008-02-10 18:05:42.299999952 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work Name: bzr:file-ids - synctools/bzr-autocommit.sh bzrautocommit.sh-20080210153001-xuwi8ok3ivxd2sle-1 + Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 Modified: tools/bzr/trunk/synctools/all.sh =================================================================== --- tools/bzr/trunk/synctools/all.sh 2008-02-10 15:39:12 UTC (rev 7843) +++ tools/bzr/trunk/synctools/all.sh 2008-02-10 17:22:48 UTC (rev 7844) @@ -16,21 +16,41 @@ function som() { failed=false - while line=$(line); do + while svnbranch=$(line); do pushd . 2>&1 > /dev/null - test -z "$line" || $(dirname $0)/som.sh "$line" || failed=true + . geturis.sh + skip=false + if test -r modified_bzr_branches_work && ! grep "^${bzrbranch}$" modified_bzr_branches_work > /dev/null; then + skip=true + fi + if test -r modified_svn_paths_work && ! grep "^${svnbranch}" modified_svn_paths_work > /dev/null; then + skip=true + fi + if test ${skip} = false; then + test -z "$svnbranch" || $(dirname $0)/som.sh "$svnbranch" || failed=true + fi popd 2>&1 > /dev/null done if $failed = true; then echo One of the sync processes failed. - rm .lock + rm -f .lock + mail -t -s "Sync failed!" z-...@us... < "$1" exit 1 fi } -cat "$@" | som +for f in modified_bzr_branches modified_svn_paths; do + test -r $f && mv -f $f ${f}_work +done +mkdir -p logs +log="logs/$(date +'%Y_%m_%d_%H_%M_%S').log" +cat "$@" | som "$log" | tee "${log}" + +rm -f modified_bzr_branches_work +rm -f modified_svn_paths_work + rm .lock Modified: tools/bzr/trunk/synctools/request-sync.sh =================================================================== --- tools/bzr/trunk/synctools/request-sync.sh 2008-02-10 15:39:12 UTC (rev 7843) +++ tools/bzr/trunk/synctools/request-sync.sh 2008-02-10 17:22:48 UTC (rev 7844) @@ -11,6 +11,29 @@ echo "TRIGGERING SYNC" +# scan mail dir +maildir=$HOME/.maildir +for f in ${maildir}/new/*; do + if grep X-Launchpad-Branch: $f > /dev/null; then + branch=$( grep X-Launchpad-Branch: $f | sed -e "s,.*/,," ) + # echo "Launchpad mail $f, branch: $branch" + echo $branch >> modified_bzr_branches + mkdir -p ${maildir}/lp + mv $f ${maildir}/lp/ + else + if grep "^From:.*@users.sourceforge.net" $f > /dev/null; then + + # echo "SF mail $f, affected paths:" + grep "^ " $f | grep -v "http://" | sed -e "s,^ *,," >> modified_svn_paths + mkdir -p ${maildir}/sf + mv $f ${maildir}/sf/ + else + echo "Unknown mail $f" + mkdir -p ${maildir}/uk + mv $f ${maildir}/uk/ + fi + fi +done rm -f .pleasewait killall -KILL bzr-wait-for-commit.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-10 17:30:42
|
Revision: 7845 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7845&view=rev Author: bazaarmagetron Date: 2008-02-10 09:30:47 -0800 (Sun, 10 Feb 2008) Log Message: ----------- author: bazaarmagetron <z-...@us...> Added code::blocks module. Modified Paths: -------------- tools/bzr/trunk/synctools/mirror.cfg Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-10 18:05:42.299999952 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work + timestamp: 2008-02-10 18:23:08.464999914 +0100 committer: bazaarmagetron <z-...@us...> properties: branch-nick: bzr Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 Modified: tools/bzr/trunk/synctools/mirror.cfg =================================================================== --- tools/bzr/trunk/synctools/mirror.cfg 2008-02-10 17:22:48 UTC (rev 7844) +++ tools/bzr/trunk/synctools/mirror.cfg 2008-02-10 17:30:47 UTC (rev 7845) @@ -1,6 +1,7 @@ armagetronad/branches/0.2.8/armagetronad armagetronad/trunk/armagetronad armagetronad/branches/0.2.8/build_eclipse +armagetronad/branches/0.2.8/build_codeblocks armagetronad/trunk/build_eclipse armagetronad/branches/0.2.8/build armagetronad/trunk/build This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-10 17:31:00
|
Revision: 7846 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7846&view=rev Author: bazaarmagetron Date: 2008-02-10 09:31:03 -0800 (Sun, 10 Feb 2008) Log Message: ----------- author: bazaarmagetron <z-...@us...> Fixed the optimization. Modified Paths: -------------- tools/bzr/trunk/synctools/all.sh tools/bzr/trunk/synctools/request-sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-10 18:23:08.464999914 +0100 committer: bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2008-02-10 18:25:52.417999983 +0100 committer: bazaarmagetron <z-...@us...> properties: branch-nick: bzr Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 26 z-...@us...-20080210172552-t1wni9izsovestm1 Modified: tools/bzr/trunk/synctools/all.sh =================================================================== --- tools/bzr/trunk/synctools/all.sh 2008-02-10 17:30:47 UTC (rev 7845) +++ tools/bzr/trunk/synctools/all.sh 2008-02-10 17:31:03 UTC (rev 7846) @@ -11,6 +11,8 @@ exit 0 fi +# set -x + touch .lock function som() @@ -20,7 +22,7 @@ pushd . 2>&1 > /dev/null . geturis.sh skip=false - if test -r modified_bzr_branches_work && ! grep "^${bzrbranch}$" modified_bzr_branches_work > /dev/null; then + if test -r modified_bzr_branches_work && ! grep "^${bzrbranch}-work$" modified_bzr_branches_work > /dev/null; then skip=true fi if test -r modified_svn_paths_work && ! grep "^${svnbranch}" modified_svn_paths_work > /dev/null; then @@ -31,7 +33,9 @@ fi popd 2>&1 > /dev/null done - + + # failed=true + if $failed = true; then echo One of the sync processes failed. rm -f .lock @@ -40,6 +44,32 @@ fi } +# scan mail dir +maildir=$HOME/.maildir +for f in ${maildir}/new/*; do + if test -r $f; then + if grep X-Launchpad-Branch: $f > /dev/null; then + branch=$( grep X-Launchpad-Branch: $f | sed -e "s,.*/,," ) + # echo "Launchpad mail $f, branch: $branch" + echo $branch >> modified_bzr_branches + mkdir -p ${maildir}/lp + mv $f ${maildir}/lp/ + else + if grep "^From:.*@users.sourceforge.net" $f > /dev/null; then + + # echo "SF mail $f, affected paths:" + grep "^ " $f | grep -v "http://" | sed -e "s,^ *,," >> modified_svn_paths + mkdir -p ${maildir}/sf + mv $f ${maildir}/sf/ + else + echo "Unknown mail $f" + mkdir -p ${maildir}/uk + mv $f ${maildir}/uk/ + fi + fi + fi +done + for f in modified_bzr_branches modified_svn_paths; do test -r $f && mv -f $f ${f}_work done Modified: tools/bzr/trunk/synctools/request-sync.sh =================================================================== --- tools/bzr/trunk/synctools/request-sync.sh 2008-02-10 17:30:47 UTC (rev 7845) +++ tools/bzr/trunk/synctools/request-sync.sh 2008-02-10 17:31:03 UTC (rev 7846) @@ -11,29 +11,6 @@ echo "TRIGGERING SYNC" -# scan mail dir -maildir=$HOME/.maildir -for f in ${maildir}/new/*; do - if grep X-Launchpad-Branch: $f > /dev/null; then - branch=$( grep X-Launchpad-Branch: $f | sed -e "s,.*/,," ) - # echo "Launchpad mail $f, branch: $branch" - echo $branch >> modified_bzr_branches - mkdir -p ${maildir}/lp - mv $f ${maildir}/lp/ - else - if grep "^From:.*@users.sourceforge.net" $f > /dev/null; then - - # echo "SF mail $f, affected paths:" - grep "^ " $f | grep -v "http://" | sed -e "s,^ *,," >> modified_svn_paths - mkdir -p ${maildir}/sf - mv $f ${maildir}/sf/ - else - echo "Unknown mail $f" - mkdir -p ${maildir}/uk - mv $f ${maildir}/uk/ - fi - fi -done rm -f .pleasewait killall -KILL bzr-wait-for-commit.sh This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-02-10 18:04:37
|
Revision: 7847 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7847&view=rev Author: bazaarmagetron Date: 2008-02-10 10:04:42 -0800 (Sun, 10 Feb 2008) Log Message: ----------- Manuel Moos: better so, wrtlprnft? Modified Paths: -------------- tools/bzr/trunk/synctools/README Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-10 18:25:52.417999983 +0100 committer: bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2008-02-10 18:56:42.671999931 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work rebase-of: z-...@us...-20080210175642-8d0kvjxtpj2ceshs Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 26 z-...@us...-20080210172552-t1wni9izsovestm1 + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 26 z-...@us...-20080210172552-t1wni9izsovestm1 27 z-...@us...-20080210175642-tqi5igd9u7pn0gsk Modified: tools/bzr/trunk/synctools/README =================================================================== --- tools/bzr/trunk/synctools/README 2008-02-10 17:31:03 UTC (rev 7846) +++ tools/bzr/trunk/synctools/README 2008-02-10 18:04:42 UTC (rev 7847) @@ -31,3 +31,6 @@ repository. The intial pull and push from there take quite a while. You can delete the resulting branches afterwards; the important thing is that your cache in ~/.bazaar/svn-cache is filled. + +all.sh also parses incoming mail in ~/.maildir/new for hints which +branches to sync. For general use, you probably don't want that. \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-03-19 00:55:05
|
Revision: 8348 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8348&view=rev Author: bazaarmagetron Date: 2008-03-18 17:55:08 -0700 (Tue, 18 Mar 2008) Log Message: ----------- Manuel Moos: Better error recovery: start again from known good backed up branch state instead of the broken branch states of the last failed operation. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-02-10 18:56:42.671999931 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: tools-bzr-trunk-work rebase-of: z-...@us...-20080210175642-8d0kvjxtpj2ceshs + timestamp: 2008-03-07 10:04:11.604000092 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: bzr rebase-of: z-...@us...-20080307090411-kavm9ludjsotsdqo Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 26 z-...@us...-20080210172552-t1wni9izsovestm1 27 z-...@us...-20080210175642-tqi5igd9u7pn0gsk + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 26 z-...@us...-20080210172552-t1wni9izsovestm1 27 z-...@us...-20080210175642-tqi5igd9u7pn0gsk 28 z-...@us...-20080307090411-kqrm17jsuog5dklq Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-03-19 00:06:06 UTC (rev 8347) +++ tools/bzr/trunk/synctools/sync.sh 2008-03-19 00:55:08 UTC (rev 8348) @@ -28,7 +28,16 @@ workdir=$(pwd) lastsuccess=true -test -r "${bzrbranch_local}-error" && lastsuccess=false +if test -r "${bzrbranch_local}-error"; then + lastsuccess=false + + # last syncing failed, start over again (most likely cause was simultaneous commits + # in bzr and svn) + echo Last sync failed, starting anew from backup... + bzr pull --overwrite -d "${bzrbranch_local}-sync" "${bzrbranch_local}-backup" || exit 1 + bzr pull --overwrite -d "${bzrbranch_local}-work" "${bzrbranch_local}-backup" || exit 1 +fi + touch "${bzrbranch_local}-error" echo pulling changes from svn... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-03-19 00:55:25
|
Revision: 8349 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8349&view=rev Author: bazaarmagetron Date: 2008-03-18 17:55:29 -0700 (Tue, 18 Mar 2008) Log Message: ----------- Manuel Moos: Better conflict and criss-cross merging support through weave based merging. Modified Paths: -------------- tools/bzr/trunk/synctools/bzr-merge.sh tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-03-07 10:04:11.604000092 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: bzr rebase-of: z-...@us...-20080307090411-kavm9ludjsotsdqo + timestamp: 2008-03-19 01:04:34.783999920 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: bzr rebase-of: z-...@us...-20080319000434-uc4rk86lt3s3a3n9 Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 26 z-...@us...-20080210172552-t1wni9izsovestm1 27 z-...@us...-20080210175642-tqi5igd9u7pn0gsk 28 z-...@us...-20080307090411-kqrm17jsuog5dklq + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 26 z-...@us...-20080210172552-t1wni9izsovestm1 27 z-...@us...-20080210175642-tqi5igd9u7pn0gsk 28 z-...@us...-20080307090411-kqrm17jsuog5dklq 29 z-...@us...-20080319000434-0tkm7nsxvhvom7bc Modified: tools/bzr/trunk/synctools/bzr-merge.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-merge.sh 2008-03-19 00:55:08 UTC (rev 8348) +++ tools/bzr/trunk/synctools/bzr-merge.sh 2008-03-19 00:55:29 UTC (rev 8349) @@ -4,7 +4,7 @@ bzr pull "$@" && exit 0 # merge them if required -bzr merge "$@" || exit 1 +bzr merge --weave "$@" || exit 1 # commit directly if there are no conflicts $(dirname $0)/bzr-autocommit.sh Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-03-19 00:55:08 UTC (rev 8348) +++ tools/bzr/trunk/synctools/sync.sh 2008-03-19 00:55:29 UTC (rev 8349) @@ -34,8 +34,13 @@ # last syncing failed, start over again (most likely cause was simultaneous commits # in bzr and svn) echo Last sync failed, starting anew from backup... - bzr pull --overwrite -d "${bzrbranch_local}-sync" "${bzrbranch_local}-backup" || exit 1 - bzr pull --overwrite -d "${bzrbranch_local}-work" "${bzrbranch_local}-backup" || exit 1 + for f in ${bzrbranch_local}-sync ${bzrbranch_local}-work; do + pushd $f + bzr rebase-abort + bzr revert + popd + bzr pull --overwrite -d $f "${bzrbranch_local}-backup" || exit 1 + done fi touch "${bzrbranch_local}-error" @@ -46,7 +51,7 @@ echo perhaps this helps: rebasing sync branch to svn... set -x pushd "${bzrbranch_local}-sync" > /dev/null - bzr rebase "${svnbranch_full}" || exit 1 + bzr rebase --weave "${svnbranch_full}" || exit 1 popd > /dev/null echo retry: pulling changes from svn... bzr pull -d "${bzrbranch_local}-sync" "${svnbranch_full}" > svnlog || exit 1 @@ -78,7 +83,7 @@ echo "merging changes from work to sync branch (instead of just pulling)..." set -x pushd "${bzrbranch_local}-sync" > /dev/null - bzr merge "${workdir}/${bzrbranch_local}-work" || exit 1 + bzr merge --weave "${workdir}/${bzrbranch_local}-work" || exit 1 ${workdir}/$(dirname $0)/bzr-autocommit.sh || exit 1 echo pushing changes from sync to work branch... bzr push "${workdir}/${bzrbranch_local}-work" || exit 1 @@ -90,7 +95,7 @@ echo perhaps this helps: rebasing work branch to sync branch... set -x pushd "${bzrbranch_local}-work" > /dev/null - bzr rebase "${workdir}/${bzrbranch_local}-sync" || exit 1 + bzr rebase --weave "${workdir}/${bzrbranch_local}-sync" || exit 1 popd > /dev/null echo retry: pulling changes from sync to work branch... bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 @@ -105,7 +110,7 @@ if ! bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}"; then echo merging changes from remote bzr work branch... pushd "${bzrbranch_local}-work" > /dev/null - bzr merge "${bzrbranch_full}" || exit 1 + bzr merge --weave "${bzrbranch_full}" || exit 1 ${workdir}/$(dirname $0)/bzr-autocommit.sh || exit 1 popd > /dev/null echo retrying the push... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-05-02 16:09:38
|
Revision: 8450 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8450&view=rev Author: bazaarmagetron Date: 2008-05-02 08:42:52 -0700 (Fri, 02 May 2008) Log Message: ----------- Manuel Moos: Merging instead of rebasing in case of simultaneous commits from bzr and svn. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-03-19 01:04:34.783999920 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: bzr rebase-of: z-...@us...-20080319000434-uc4rk86lt3s3a3n9 + timestamp: 2008-03-19 21:32:15.046999931 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: bzr Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 26 z-...@us...-20080210172552-t1wni9izsovestm1 27 z-...@us...-20080210175642-tqi5igd9u7pn0gsk 28 z-...@us...-20080307090411-kqrm17jsuog5dklq 29 z-...@us...-20080319000434-0tkm7nsxvhvom7bc + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 26 z-...@us...-20080210172552-t1wni9izsovestm1 27 z-...@us...-20080210175642-tqi5igd9u7pn0gsk 28 z-...@us...-20080307090411-kqrm17jsuog5dklq 29 z-...@us...-20080319000434-0tkm7nsxvhvom7bc 30 z-...@us...-20080319203215-gg1xrptgja16kk7r Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-05-01 16:43:15 UTC (rev 8449) +++ tools/bzr/trunk/synctools/sync.sh 2008-05-02 15:42:52 UTC (rev 8450) @@ -71,15 +71,22 @@ exit 0 fi +svnchanged=false +test -z "$(cat svnlog | grep '^Now on')" || svnchanged=true +bzrchanged=false +test -z "$(cat bzrlog | grep '^Now on')" || bzrchanged=true + +echo $bzrchanged $svnchanged + rm -f svnlog bzrlog -echo logging work branch... -bzr log "${bzrbranch_local}-work" > "${bzrbranch_local}-work-log" || exit 1 +#echo logging work branch... +#bzr log "${bzrbranch_local}-work" > "${bzrbranch_local}-work-log" || exit 1 # check whether the log from the remote branch has only added items relative # to the last backup. -if diff "${bzrbranch_local}-work-log" "${bzrbranch_local}-backup-log" | grep "^>" > /dev/null; then - echo "Remote branch revision order has changed. Doctor, we need to operate!" +if test "$svnchanged" = true && test "$bzrchanged" = true; then # diff "${bzrbranch_local}-work-log" "${bzrbranch_local}-backup-log" | grep "^>" > /dev/null; then + echo "Simultaneous commits. Doctor, we need to operate!" echo "merging changes from work to sync branch (instead of just pulling)..." set -x pushd "${bzrbranch_local}-sync" > /dev/null @@ -126,7 +133,7 @@ else bzr branch "${bzrbranch_local}-sync" "${bzrbranch_local}-backup" || exit 1 fi -bzr log "${bzrbranch_local}-backup" > "${bzrbranch_local}-backup-log" || exit 1 +# bzr log "${bzrbranch_local}-backup" > "${bzrbranch_local}-backup-log" || exit 1 echo done! rm -f "${bzrbranch_local}-error" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-05-02 16:47:27
|
Revision: 8451 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8451&view=rev Author: bazaarmagetron Date: 2008-05-02 08:43:16 -0700 (Fri, 02 May 2008) Log Message: ----------- Bazaarmagetron: Added automatic lock breaking. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2008-03-19 21:32:15.046999931 +0100 committer: Manuel Moos <z-...@us...> properties: branch-nick: bzr + timestamp: 2008-05-02 17:39:11.200000048 +0200 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Name: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs - 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 26 z-...@us...-20080210172552-t1wni9izsovestm1 27 z-...@us...-20080210175642-tqi5igd9u7pn0gsk 28 z-...@us...-20080307090411-kqrm17jsuog5dklq 29 z-...@us...-20080319000434-0tkm7nsxvhvom7bc 30 z-...@us...-20080319203215-gg1xrptgja16kk7r + 11 z-...@us...-20080207161753-lxmjabk915rkcdmz 12 z-...@us...-20080207162744-4riit8379zi13ekd 13 z-...@us...-20080207220145-74cas2qumuyn2vcn 14 z-...@us...-20080207221008-zhs110iw1vtreysm 15 z-...@us...-20080207221223-4b0wgl86lxox3uwj 16 z-...@us...-20080208001947-ff25qitcr900qsvy 17 manuel@gonzo-20080208020101-022vu3sa9bvqa2jn 18 z-...@us...-20080208021135-93i43tke8qfcb3u4 19 z-...@us...-20080208120320-6dxkcn46tdv109jb 20 z-...@us...-20080208120416-c3711pdfebb9m8ba 21 z-...@us...-20080208120611-jzqvstdirza22aa0 22 z-...@us...-20080210142402-67q9uws5tgw4anze 23 z-...@us...-20080210153017-32tq0mbladuewpl7 24 z-...@us...-20080210170542-l20whi1m3g5t0xz6 25 z-...@us...-20080210172308-damc370nmc001sy8 26 z-...@us...-20080210172552-t1wni9izsovestm1 27 z-...@us...-20080210175642-tqi5igd9u7pn0gsk 28 z-...@us...-20080307090411-kqrm17jsuog5dklq 29 z-...@us...-20080319000434-0tkm7nsxvhvom7bc 30 z-...@us...-20080319203215-gg1xrptgja16kk7r 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-05-02 15:42:52 UTC (rev 8450) +++ tools/bzr/trunk/synctools/sync.sh 2008-05-02 15:43:16 UTC (rev 8451) @@ -36,6 +36,7 @@ echo Last sync failed, starting anew from backup... for f in ${bzrbranch_local}-sync ${bzrbranch_local}-work; do pushd $f + yes | bzr break-lock -q bzr rebase-abort bzr revert popd This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |