Mon 2009-04-06 10:57:20 +1000
0.033  bzr arguments: [u'branch', u'/branch/checkout', u'/branch/checkout/gamon-s
entiment-results']
0.042  looking for plugins in /home/mary/.bazaar/plugins
0.043  looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.113  encoding stdout as sys.stdout encoding 'UTF-8'
0.217  opening working tree '/branch/checkout'
0.350  opening working tree '/branch/checkout'
0.529  creating branch <bzrlib.branch.BzrBranchFormat6 object at 0x8f4b1ac> in file:///branch/checkout/gamon-sentiment-
results/.bzr/
0.583  created new branch BzrBranch6('file:///branch/checkout/gamon-sentiment-results/')
[ 6859] 2009-04-06 10:57:21.669 INFO: Branched 650 revision(s).
0.757  return code 0

Mon 2009-04-06 10:57:27 +1000
0.033  bzr arguments: [u'switch', u'/branch/checkout/gamon-sentiment-results']
0.042  looking for plugins in /home/mary/.bazaar/plugins
0.042  looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.111  encoding stdout as sys.stdout encoding 'UTF-8'
0.219  opening working tree '/home/mary/PhD'
0.245  opening working tree '/home/mary/PhD'
[ 6860] 2009-04-06 10:57:28.212 WARNING: Conflict: can't delete Reports/Experimental Proposals/Author sentiment characteristics because it is not empty.  Not deleting.
[ 6860] 2009-04-06 10:57:28.216 WARNING: Conflict because Reports/Experimental Proposals/Author sentiment characteristics is not versioned, but has versioned children.  Versioned directory.
[ 6860] 2009-04-06 10:57:28.216 WARNING: Contents conflict in Reports/Experimental Proposals/Author sentiment characteristics/proposal.tex
[ 6860] 2009-04-06 10:57:28.336 INFO: Updated to revision 650.
[ 6860] 2009-04-06 10:57:28.390 INFO: Switched to branch: /branch/checkout/gamon-sentiment-results/
0.872  return code 0

Mon 2009-04-06 10:58:53 +1000
0.033  bzr arguments: [u'ci', u'-m', u'Begin, need to bug fix']
0.043  looking for plugins in /home/mary/.bazaar/plugins
0.043  looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.115  encoding stdout as sys.stdout encoding 'UTF-8'
0.219  opening working tree '/home/mary/PhD'
0.275  preparing to commit
0.300  Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 716, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 911, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 547, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 2796, in run
    raise errors.BzrCommandError('Conflicts detected in working '
BzrCommandError: Conflicts detected in working tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.

0.301  return code 3