I've attached my ~/.bzr.log.

Also, for further clarification, here is the svn log message and property diff
for the revision in question:

$ svn diff -N -r 34024:34025 https://svn.ekenosen.net/imrs/branches/paging_optimization

Property changes on: .
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2007-12-21 10:45:13.105999947 -0500
committer: nicholas a. evans <email address hidden>
properties: 
        branch-nick: trunk

   + timestamp: 2008-01-14 14:03:26.207000017 -0500
committer: nicholas a. evans <email address hidden>
properties: 
        branch-nick: trunk

Name: bzr:revision-id:v3-trunk1
   - 1887 <email address hidden>
1894 <email address hidden>
1895 <email address hidden>
1897 <email address hidden>
1898 <email address hidden>
1899 <email address hidden>
1912 <email address hidden>
1914 <email address hidden>
1921 <email address hidden>
1926 <email address hidden>
1933 <email address hidden>
1936 <email address hidden>
1937 <email address hidden>
1954 <email address hidden>
1957 <email address hidden>
1958 <email address hidden>
1973 <email address hidden>
1974 <email address hidden>
1978 <email address hidden>
1985 <email address hidden>
1989 <email address hidden>
1999 <email address hidden>
2002 <email address hidden>
2005 <email address hidden>
2013 <email address hidden>
2014 <email address hidden>
2015 <email address hidden>
2017 <email address hidden>
2046 <email address hidden>
2047 <email address hidden>
2064 <email address hidden>
2086 <email address hidden>
2102 <email address hidden>
2205 <email address hidden>
2210 <email address hidden>
2242 <email address hidden>
2253 <email address hidden>
2269 <email address hidden>
2273 <email address hidden>
2278 <email address hidden>

   + 1887 <email address hidden>
1894 <email address hidden>
1895 <email address hidden>
1897 <email address hidden>
1898 <email address hidden>
1899 <email address hidden>
1912 <email address hidden>
1914 <email address hidden>
1921 <email address hidden>
1926 <email address hidden>
1933 <email address hidden>
1936 <email address hidden>
1937 <email address hidden>
1954 <email address hidden>
1957 <email address hidden>
1958 <email address hidden>
1973 <email address hidden>
1974 <email address hidden>
1978 <email address hidden>
1985 <email address hidden>
1989 <email address hidden>
1999 <email address hidden>
2002 <email address hidden>
2005 <email address hidden>
2013 <email address hidden>
2014 <email address hidden>
2015 <email address hidden>
2017 <email address hidden>
2046 <email address hidden>
2047 <email address hidden>
2064 <email address hidden>
2086 <email address hidden>
2102 <email address hidden>
2205 <email address hidden>
2210 <email address hidden>
2242 <email address hidden>
2253 <email address hidden>
2269 <email address hidden>
2273 <email address hidden>
2278 <email address hidden>
2354 <email address hidden>
2355 <email address hidden>

$ svn log -r 34025 https://svn.ekenosen.net/imrs/branches/paging_optimization
------------------------------------------------------------------------
r34025 | trey | 2008-01-14 18:45:32 -0500 (Mon, 14 Jan 2008) | 4 lines

Merging with latest and greatest from trunk.

Refs #5016.

------------------------------------------------------------------------

So, it looks like you are right that this is caused by the svn merge.  I have two questions about that though: 1) why didn't this trigger an error on my home computer (using bzr 1.0 and latest stable bzr-svn), 2) is there a workaround I could use?

Thanks!