[Armagetronad-commits] SF.net SVN: armagetronad:[8713] tools/bzr/trunk

[<baz...@us...>]

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.