From: <baz...@us...> - 2008-08-02 08:45:26
|
Revision: 8512 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8512&view=rev Author: bazaarmagetron Date: 2008-08-02 08:45:36 +0000 (Sat, 02 Aug 2008) Log Message: ----------- Bazaarmagetron: Added patch to bzr-svn that produces SVN log messages containing the original author. Added Paths: ----------- tools/bzr/trunk/synctools/bzr-svn.patch Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2008-05-02 17:39:11.200000048 +0200 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2008-08-02 10:39:16.219000101 +0200 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: bzr:file-ids - + synctools/bzr-svn.patch bzrsvn.patch-20080802083908-qxim6r0ydez7paep-1 Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn Added: tools/bzr/trunk/synctools/bzr-svn.patch =================================================================== --- tools/bzr/trunk/synctools/bzr-svn.patch (rev 0) +++ tools/bzr/trunk/synctools/bzr-svn.patch 2008-08-02 08:45:36 UTC (rev 8512) @@ -0,0 +1,28 @@ +Only in bzr-svn-0.4.7-my: build +diff -u -r bzr-svn-0.4.7/commit.py bzr-svn-0.4.7-my/commit.py +--- bzr-svn-0.4.7/commit.py 2008-02-01 01:46:14.000000000 +0100 ++++ bzr-svn-0.4.7-my/commit.py 2008-02-10 18:54:28.000000000 +0100 +@@ -27,6 +27,8 @@ + from bzrlib.revision import NULL_REVISION + from bzrlib.trace import mutter + ++import string ++ + from copy import deepcopy + from cStringIO import StringIO + from errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed +@@ -447,6 +449,13 @@ + self.revnum = revision + self.date = date + self.author = author ++ ++ if not self.repository.get_config().get_override_svn_revprops(): ++ shortauthor=string.join(self._committer.split('<')[0].split()) ++ if message.count("\n") <= 1: ++ message = shortauthor + ": " + message ++ else: ++ message = "author: " + shortauthor + "\n" + message + + bp_parts = self.branch.get_branch_path().split("/") + repository_latest_revnum = self.repository.transport.get_latest_revnum() +Only in bzr-svn-0.4.7-my: commit.py~ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2008-12-31 18:41:01
|
Revision: 8713 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8713&view=rev Author: bazaarmagetron Date: 2008-12-31 18:40:57 +0000 (Wed, 31 Dec 2008) Log Message: ----------- Bazaarmagetron: Made more error tolerant. Modified Paths: -------------- tools/bzr/trunk/synctools/bzr-autocommit.sh tools/bzr/trunk/synctools/bzr-run-in-loop.sh tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2008-08-02 10:39:16.219000101 +0200 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2008-12-31 19:29:22.653000116 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: bzr:file-ids - synctools/bzr-svn.patch bzrsvn.patch-20080802083908-qxim6r0ydez7paep-1 + Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b Modified: tools/bzr/trunk/synctools/bzr-autocommit.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-autocommit.sh 2008-12-31 17:15:36 UTC (rev 8712) +++ tools/bzr/trunk/synctools/bzr-autocommit.sh 2008-12-31 18:40:57 UTC (rev 8713) @@ -4,6 +4,9 @@ if test -z "$(bzr diff)"; then bzr commit -m "Empty merge to keep the peace between svn and bzr." + + # ignore errors + true else tmp=$(tempfile) msg="MERGING${tmp}": Modified: tools/bzr/trunk/synctools/bzr-run-in-loop.sh =================================================================== --- tools/bzr/trunk/synctools/bzr-run-in-loop.sh 2008-12-31 17:15:36 UTC (rev 8712) +++ tools/bzr/trunk/synctools/bzr-run-in-loop.sh 2008-12-31 18:40:57 UTC (rev 8713) @@ -8,4 +8,10 @@ ./bzr-wait-for-commit.sh touch .pleasewait ./all.sh mirror.cfg + pushd ~/armagetron/bzr-clio/synctools + ./all.sh mirror.cfg + #../../bzr/synctools/breaklock.sh + popd + ./all.sh mirror.cfg + #./breaklock.sh done Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-12-31 17:15:36 UTC (rev 8712) +++ tools/bzr/trunk/synctools/sync.sh 2008-12-31 18:40:57 UTC (rev 8713) @@ -91,7 +91,7 @@ echo "merging changes from work to sync branch (instead of just pulling)..." set -x pushd "${bzrbranch_local}-sync" > /dev/null - bzr merge --weave "${workdir}/${bzrbranch_local}-work" || exit 1 + bzr merge --pull --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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-01 00:59:34
|
Revision: 8716 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8716&view=rev Author: bazaarmagetron Date: 2009-01-01 00:59:26 +0000 (Thu, 01 Jan 2009) Log Message: ----------- Bazaarmagetron: Removing tags before pushing to svn. bzr-svn doesn't like tags. Plus, test commit for this functionality :) Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2008-12-31 19:29:22.653000116 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2009-01-01 01:54:37.170000076 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2008-12-31 19:40:45 UTC (rev 8715) +++ tools/bzr/trunk/synctools/sync.sh 2009-01-01 00:59:26 UTC (rev 8716) @@ -125,6 +125,17 @@ bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}" || exit -1 fi +echo removing tags... +function removetag() +{ +while tag="$(line)"; do + bzr tag "${tag}" --delete +done +} +pushd "${bzrbranch_local}-sync" +bzr log "${bzrbranch_local}-sync" | grep "^tag: " | sed -e "s,^tag: ,," | removetag +popd + echo pushing sync branch to SVN... bzr push -d "${bzrbranch_local}-sync" "${svnbranch_full}" || exit 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-04 00:28:42
|
Revision: 8733 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8733&view=rev Author: bazaarmagetron Date: 2009-01-04 00:28:34 +0000 (Sun, 04 Jan 2009) Log Message: ----------- Bazaarmagetron: Yeah, of course. Screwed it up. Fix and new test commit. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-01 01:54:37.170000076 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2009-01-01 01:59:52.134999990 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2009-01-04 00:10:16 UTC (rev 8732) +++ tools/bzr/trunk/synctools/sync.sh 2009-01-04 00:28:34 UTC (rev 8733) @@ -133,7 +133,7 @@ done } pushd "${bzrbranch_local}-sync" -bzr log "${bzrbranch_local}-sync" | grep "^tag: " | sed -e "s,^tag: ,," | removetag +bzr log | grep "^tag: " | sed -e "s,^tag: ,," | removetag popd echo pushing sync branch to SVN... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-04 00:29:14
|
Revision: 8734 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8734&view=rev Author: bazaarmagetron Date: 2009-01-04 00:29:06 +0000 (Sun, 04 Jan 2009) Log Message: ----------- Bazaarmagetron: prettier tag stripping output. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-01 01:59:52.134999990 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2009-01-01 17:42:14.316999912 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2009-01-04 00:28:34 UTC (rev 8733) +++ tools/bzr/trunk/synctools/sync.sh 2009-01-04 00:29:06 UTC (rev 8734) @@ -129,12 +129,13 @@ function removetag() { while tag="$(line)"; do - bzr tag "${tag}" --delete + echo Removing tag \""${tag}"\"... + bzr tag "${tag}" --delete done } -pushd "${bzrbranch_local}-sync" +pushd "${bzrbranch_local}-sync" > /dev/null 2>&1 bzr log | grep "^tag: " | sed -e "s,^tag: ,," | removetag -popd +popd > /dev/null 2>&1 echo pushing sync branch to SVN... bzr push -d "${bzrbranch_local}-sync" "${svnbranch_full}" || exit 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-04 00:29:48
|
Revision: 8735 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8735&view=rev Author: bazaarmagetron Date: 2009-01-04 00:29:42 +0000 (Sun, 04 Jan 2009) Log Message: ----------- Bazaarmagetron: Corrected branch deletion. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-01 17:42:14.316999912 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2009-01-04 01:20:17.118999958 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2009-01-04 00:29:06 UTC (rev 8734) +++ tools/bzr/trunk/synctools/sync.sh 2009-01-04 00:29:42 UTC (rev 8735) @@ -129,12 +129,12 @@ function removetag() { while tag="$(line)"; do - echo Removing tag \""${tag}"\"... + # echo Removing tag \""${tag}"\"... bzr tag "${tag}" --delete done } pushd "${bzrbranch_local}-sync" > /dev/null 2>&1 -bzr log | grep "^tag: " | sed -e "s,^tag: ,," | removetag +bzr log | grep "^ *tags: " | sed -e "s,^ *tags: ,," | removetag popd > /dev/null 2>&1 echo pushing sync branch to SVN... This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-04 00:30:33
|
Revision: 8736 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8736&view=rev Author: bazaarmagetron Date: 2009-01-04 00:30:30 +0000 (Sun, 04 Jan 2009) Log Message: ----------- Bazaarmagetron: Added php client. Modified Paths: -------------- tools/bzr/trunk/synctools/mirror.cfg Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-04 01:20:17.118999958 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2009-01-04 01:20:34.207000017 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl Modified: tools/bzr/trunk/synctools/mirror.cfg =================================================================== --- tools/bzr/trunk/synctools/mirror.cfg 2009-01-04 00:29:42 UTC (rev 8735) +++ tools/bzr/trunk/synctools/mirror.cfg 2009-01-04 00:30:30 UTC (rev 8736) @@ -7,4 +7,5 @@ armagetronad/trunk/build armagetronad/branches/0.2.8/winlibs armagetronad/trunk/winlibs +tools/php-client/trunk tools/bzr/trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-22 08:23:44
|
Revision: 8873 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8873&view=rev Author: bazaarmagetron Date: 2009-01-22 08:23:31 +0000 (Thu, 22 Jan 2009) Log Message: ----------- Bazaarmagetron: Simplified. Removed some futile retries and rebases. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-04 01:20:34.207000017 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2009-01-22 09:18:01.980000019 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2009-01-21 17:52:43 UTC (rev 8872) +++ tools/bzr/trunk/synctools/sync.sh 2009-01-22 08:23:31 UTC (rev 8873) @@ -37,7 +37,6 @@ for f in ${bzrbranch_local}-sync ${bzrbranch_local}-work; do pushd $f yes | bzr break-lock -q - bzr rebase-abort bzr revert popd bzr pull --overwrite -d $f "${bzrbranch_local}-backup" || exit 1 @@ -49,14 +48,7 @@ echo pulling changes from svn... 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 --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 - set +x + exit 1 fi cat svnlog @@ -99,31 +91,14 @@ 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 --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 - set +x - fi + bzr pull -d "${bzrbranch_local}-work" "${bzrbranch_local}-sync" || exit 1 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... -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 --weave "${bzrbranch_full}" || 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 -fi +bzr push -d "${bzrbranch_local}-work" "${bzrbranch_full}" || exit 1 echo removing tags... function removetag() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-22 08:46:01
|
Revision: 8874 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8874&view=rev Author: bazaarmagetron Date: 2009-01-22 08:45:51 +0000 (Thu, 22 Jan 2009) Log Message: ----------- Bazaarmagetron: Re-added history change check. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-22 09:18:01.980000019 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2009-01-22 09:25:59.908999920 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr-clio Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2009-01-22 08:23:31 UTC (rev 8873) +++ tools/bzr/trunk/synctools/sync.sh 2009-01-22 08:45:51 UTC (rev 8874) @@ -73,17 +73,17 @@ 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 test "$svnchanged" = true && test "$bzrchanged" = true; then # diff "${bzrbranch_local}-work-log" "${bzrbranch_local}-backup-log" | grep "^>" > /dev/null; then +if test "$svnchanged" = true && test "$bzrchanged" = true || 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 - bzr merge --pull --weave "${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 @@ -121,7 +121,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...> - 2009-01-22 08:46:57
|
Revision: 8875 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8875&view=rev Author: bazaarmagetron Date: 2009-01-22 08:46:44 +0000 (Thu, 22 Jan 2009) Log Message: ----------- Bazaarmagetron: Added backup branch logging. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-22 09:25:59.908999920 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr-clio + timestamp: 2009-01-22 09:37:31.328999996 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr-clio Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2009-01-22 08:45:51 UTC (rev 8874) +++ tools/bzr/trunk/synctools/sync.sh 2009-01-22 08:46:44 UTC (rev 8875) @@ -74,6 +74,7 @@ rm -f svnlog bzrlog echo logging work branch... +test -r "${bzrbranch_local}-backup-log" || bzr log "${bzrbranch_local}-backup" > "${bzrbranch_local}-backup-log" || exit 1 bzr log "${bzrbranch_local}-work" > "${bzrbranch_local}-work-log" || exit 1 # check whether the log from the remote branch has only added items relative This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-22 08:56:50
|
Revision: 8876 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8876&view=rev Author: bazaarmagetron Date: 2009-01-22 08:56:45 +0000 (Thu, 22 Jan 2009) Log Message: ----------- author: Bazaarmagetron Automatic merging of commits that would change history order: ------------------------------------------------------------ revno: 40.1.2 committer: Bazaarmagetron <z-...@us...> branch nick: bzr-test timestamp: Thu 2009-01-22 09:43:26 +0100 message: Merge test. ------------------------------------------------------------ revno: 40.1.1 committer: Bazaarmagetron <z-...@us...> branch nick: bzr-test timestamp: Thu 2009-01-22 09:42:47 +0100 message: Random test change. Modified Paths: -------------- tools/bzr/trunk/synctools/README Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-22 09:37:31.328999996 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr-clio + timestamp: 2009-01-22 09:55:14.913000107 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: tools-bzr-trunk-sync Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura 42 z-...@us...-20090122085514-43dp3vxdy8nrhcs0 Added: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs + z-...@us...-20090122084326-wmaavb5hvgu21jt4 Modified: tools/bzr/trunk/synctools/README =================================================================== --- tools/bzr/trunk/synctools/README 2009-01-22 08:46:44 UTC (rev 8875) +++ tools/bzr/trunk/synctools/README 2009-01-22 08:56:45 UTC (rev 8876) @@ -33,4 +33,4 @@ 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 +branches to sync. For general use, you probably don't want that. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-23 22:44:57
|
Revision: 8883 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8883&view=rev Author: bazaarmagetron Date: 2009-01-23 22:21:45 +0000 (Fri, 23 Jan 2009) Log Message: ----------- Bazaarmagetron: for real now. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-23 20:16:07.931999922 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2009-01-23 20:17:33.808000088 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura 42 z-...@us...-20090122085514-43dp3vxdy8nrhcs0 43 z-...@us...-20090123191607-ptlcewlv4z7rwe8p + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura 42 z-...@us...-20090122085514-43dp3vxdy8nrhcs0 43 z-...@us...-20090123191607-ptlcewlv4z7rwe8p 44 z-...@us...-20090123191733-hdp9ipi964hjuxvj Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2009-01-23 22:20:50 UTC (rev 8882) +++ tools/bzr/trunk/synctools/sync.sh 2009-01-23 22:21:45 UTC (rev 8883) @@ -114,7 +114,7 @@ popd > /dev/null 2>&1 echo pushing sync branch to SVN... -bzr push-svn --merged -d "${bzrbranch_local}-sync" "${svnbranch_full}" || exit 1 +bzr svn-push --merged -d "${bzrbranch_local}-sync" "${svnbranch_full}" || exit 1 echo making backup of successful operation... if test -d "${bzrbranch_local}-backup"; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-23 22:45:09
|
Revision: 8882 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8882&view=rev Author: bazaarmagetron Date: 2009-01-23 22:20:50 +0000 (Fri, 23 Jan 2009) Log Message: ----------- Bazaarmagetron: using svn-push now. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-22 09:55:14.913000107 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: tools-bzr-trunk-sync + timestamp: 2009-01-23 20:16:07.931999922 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura 42 z-...@us...-20090122085514-43dp3vxdy8nrhcs0 + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura 42 z-...@us...-20090122085514-43dp3vxdy8nrhcs0 43 z-...@us...-20090123191607-ptlcewlv4z7rwe8p Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2009-01-23 15:25:53 UTC (rev 8881) +++ tools/bzr/trunk/synctools/sync.sh 2009-01-23 22:20:50 UTC (rev 8882) @@ -114,7 +114,7 @@ popd > /dev/null 2>&1 echo pushing sync branch to SVN... -bzr push -d "${bzrbranch_local}-sync" "${svnbranch_full}" || exit 1 +bzr push-svn --merged -d "${bzrbranch_local}-sync" "${svnbranch_full}" || exit 1 echo making backup of successful operation... if test -d "${bzrbranch_local}-backup"; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-24 09:28:01
|
Revision: 8884 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8884&view=rev Author: bazaarmagetron Date: 2009-01-24 09:27:53 +0000 (Sat, 24 Jan 2009) Log Message: ----------- Bazaarmagetron: Back to regular push. Can't install a bzr-svn version supporting --merged. Modified Paths: -------------- tools/bzr/trunk/synctools/sync.sh Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-23 20:17:33.808000088 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2009-01-24 10:20:57.992000103 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura 42 z-...@us...-20090122085514-43dp3vxdy8nrhcs0 43 z-...@us...-20090123191607-ptlcewlv4z7rwe8p 44 z-...@us...-20090123191733-hdp9ipi964hjuxvj + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura 42 z-...@us...-20090122085514-43dp3vxdy8nrhcs0 43 z-...@us...-20090123191607-ptlcewlv4z7rwe8p 44 z-...@us...-20090123191733-hdp9ipi964hjuxvj 45 z-...@us...-20090124092057-xsfto52czk8tfm9g Modified: tools/bzr/trunk/synctools/sync.sh =================================================================== --- tools/bzr/trunk/synctools/sync.sh 2009-01-23 22:21:45 UTC (rev 8883) +++ tools/bzr/trunk/synctools/sync.sh 2009-01-24 09:27:53 UTC (rev 8884) @@ -114,7 +114,7 @@ popd > /dev/null 2>&1 echo pushing sync branch to SVN... -bzr svn-push --merged -d "${bzrbranch_local}-sync" "${svnbranch_full}" || exit 1 +bzr svn-push -d "${bzrbranch_local}-sync" "${svnbranch_full}" || exit 1 echo making backup of successful operation... if test -d "${bzrbranch_local}-backup"; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-01-24 09:28:40
|
Revision: 8885 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=8885&view=rev Author: bazaarmagetron Date: 2009-01-24 09:28:36 +0000 (Sat, 24 Jan 2009) Log Message: ----------- Bazaarmagetron: Moved AA config files out of the way. Added Paths: ----------- tools/bzr/trunk/synctools/config.sh.aa tools/bzr/trunk/synctools/mirror.cfg.aa Removed Paths: ------------- tools/bzr/trunk/synctools/config.sh tools/bzr/trunk/synctools/mirror.cfg Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-24 10:20:57.992000103 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2009-01-24 10:22:20.272000074 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: bzr:file-ids - + synctools/mirror.cfg.aa 7755@7d95bf1e-0414-0410-9756-b78462a59f44:tools%2Fbzr%2Ftrunk:synctools%2Fmirror.cfg synctools/config.sh.aa 7755@7d95bf1e-0414-0410-9756-b78462a59f44:tools%2Fbzr%2Ftrunk:synctools%2Fconfig.sh Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura 42 z-...@us...-20090122085514-43dp3vxdy8nrhcs0 43 z-...@us...-20090123191607-ptlcewlv4z7rwe8p 44 z-...@us...-20090123191733-hdp9ipi964hjuxvj 45 z-...@us...-20090124092057-xsfto52czk8tfm9g + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura 42 z-...@us...-20090122085514-43dp3vxdy8nrhcs0 43 z-...@us...-20090123191607-ptlcewlv4z7rwe8p 44 z-...@us...-20090123191733-hdp9ipi964hjuxvj 45 z-...@us...-20090124092057-xsfto52czk8tfm9g 46 z-...@us...-20090124092220-hui9u14erj446it5 Deleted: tools/bzr/trunk/synctools/config.sh =================================================================== --- tools/bzr/trunk/synctools/config.sh 2009-01-24 09:27:53 UTC (rev 8884) +++ tools/bzr/trunk/synctools/config.sh 2009-01-24 09:28:36 UTC (rev 8885) @@ -1,7 +0,0 @@ -# configuration file for all branches - -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 Copied: tools/bzr/trunk/synctools/config.sh.aa (from rev 8884, tools/bzr/trunk/synctools/config.sh) =================================================================== --- tools/bzr/trunk/synctools/config.sh.aa (rev 0) +++ tools/bzr/trunk/synctools/config.sh.aa 2009-01-24 09:28:36 UTC (rev 8885) @@ -0,0 +1,7 @@ +# configuration file for all branches + +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 Deleted: tools/bzr/trunk/synctools/mirror.cfg =================================================================== --- tools/bzr/trunk/synctools/mirror.cfg 2009-01-24 09:27:53 UTC (rev 8884) +++ tools/bzr/trunk/synctools/mirror.cfg 2009-01-24 09:28:36 UTC (rev 8885) @@ -1,11 +0,0 @@ -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 -armagetronad/branches/0.2.8/winlibs -armagetronad/trunk/winlibs -tools/php-client/trunk -tools/bzr/trunk Copied: tools/bzr/trunk/synctools/mirror.cfg.aa (from rev 8884, tools/bzr/trunk/synctools/mirror.cfg) =================================================================== --- tools/bzr/trunk/synctools/mirror.cfg.aa (rev 0) +++ tools/bzr/trunk/synctools/mirror.cfg.aa 2009-01-24 09:28:36 UTC (rev 8885) @@ -0,0 +1,13 @@ +armagetronad/branches/0.2.8/armagetronad +armagetronad/trunk/armagetronad +armagetronad/branches/utf8/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 +armagetronad/branches/0.2.8/winlibs +armagetronad/trunk/winlibs +tools/php-client/trunk +tools/bzr/trunk +tools/buildbot/trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <baz...@us...> - 2009-04-25 07:53:11
|
Revision: 9229 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9229&view=rev Author: bazaarmagetron Date: 2009-04-25 07:53:07 +0000 (Sat, 25 Apr 2009) Log Message: ----------- Bazaarmagetron: Removed obsolete utf8 branch Modified Paths: -------------- tools/bzr/trunk/synctools/mirror.cfg.aa Property Changed: ---------------- tools/bzr/trunk/ Property changes on: tools/bzr/trunk ___________________________________________________________________ Modified: bzr:revision-info - timestamp: 2009-01-24 10:22:20.272000074 +0100 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr + timestamp: 2009-04-25 09:47:19.016999960 +0200 committer: Bazaarmagetron <z-...@us...> properties: branch-nick: bzr Modified: bzr:file-ids - synctools/mirror.cfg.aa 7755@7d95bf1e-0414-0410-9756-b78462a59f44:tools%2Fbzr%2Ftrunk:synctools%2Fmirror.cfg synctools/config.sh.aa 7755@7d95bf1e-0414-0410-9756-b78462a59f44:tools%2Fbzr%2Ftrunk:synctools%2Fconfig.sh + Modified: 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 31 z-...@us...-20080502153911-ggfwup8c7syjcr56 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura 42 z-...@us...-20090122085514-43dp3vxdy8nrhcs0 43 z-...@us...-20090123191607-ptlcewlv4z7rwe8p 44 z-...@us...-20090123191733-hdp9ipi964hjuxvj 45 z-...@us...-20090124092057-xsfto52czk8tfm9g 46 z-...@us...-20090124092220-hui9u14erj446it5 + 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 32 z-...@us...-20080802083916-wwxh1y9u7th78fzn 33 z-...@us...-20081231182922-hca73zglnco0ue0b 34 z-...@us...-20090101005437-hse84mogqc2r2lwx 35 z-...@us...-20090101005952-tc9fmgyackfo70tm 36 z-...@us...-20090101164214-tr4iif10a7sz2u9e 37 z-...@us...-20090104002017-01l5pa6i6wf9n989 38 z-...@us...-20090104002034-fwdkf9czix9ia3zl 39 z-...@us...-20090122081801-189q5jbty56qqrid 40 z-...@us...-20090122082559-p3i26ld4bx209q3d 41 z-...@us...-20090122083731-2gog58o28lbewura 42 z-...@us...-20090122085514-43dp3vxdy8nrhcs0 43 z-...@us...-20090123191607-ptlcewlv4z7rwe8p 44 z-...@us...-20090123191733-hdp9ipi964hjuxvj 45 z-...@us...-20090124092057-xsfto52czk8tfm9g 46 z-...@us...-20090124092220-hui9u14erj446it5 47 z-...@us...-20090425074719-x5tm1xljrmz06j1h Modified: tools/bzr/trunk/synctools/mirror.cfg.aa =================================================================== --- tools/bzr/trunk/synctools/mirror.cfg.aa 2009-04-25 07:47:12 UTC (rev 9228) +++ tools/bzr/trunk/synctools/mirror.cfg.aa 2009-04-25 07:53:07 UTC (rev 9229) @@ -1,6 +1,5 @@ armagetronad/branches/0.2.8/armagetronad armagetronad/trunk/armagetronad -armagetronad/branches/utf8/armagetronad armagetronad/branches/0.2.8/build_eclipse armagetronad/branches/0.2.8/build_codeblocks armagetronad/trunk/build_eclipse This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |