No subject

I was told revision 492 was committed on the server.

On the server in the project branch I then did "bzr update" and I was
told that I was at revision 491.

I've tried merge and pull but none worked.

On the laptop
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

"bzr info"
 -------------

 Repository checkout (format: 2a)
 Location:
 =A0repository checkout root: .
 =A0 =A0 =A0 =A0checkout of branch:
 bzr+ssh://bigtom/usr/local/bzr-repos-local-and-ox/brawler-wrk/
 =A0 =A0 =A0 =A0 shared repository: /usr/local/bzr-repos-local-and-ox

 "bzr version-info"
 ------------------------

 revision-id: tom.browder at mantech.com-20101208035148-kfb09eyw74e0c2im
 date: 2010-12-07 21:51:48 -0600
 build-date: 2010-12-08 11:03:15 -0600
 revno: 492
 branch-nick: brawler-wrk

 On the server
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D

 "bzr info"
 -------------

 Repository checkout (format: 2a)
 Location:
 =A0repository checkout root: .
 =A0 =A0 =A0 =A0checkout of branch: svn+ssh://localhost/usr/local/svn-repos=
/brawler-wrk
 =A0 =A0 =A0 =A0 shared repository: /usr/local/bzr-repos-local-and-ox

 Related branches:
 =A0submit branch: .

 "bzr version-info"
 ------------------------

 revision-id: svn-v4:16d77eea-cc0a-4723-b047-1ee92482f43b::490
 date: 2010-10-08 16:12:35 +0000
 svn-revno: 490
 svn-uuid: 16d77eea-cc0a-4723-b047-1ee92482f43b
 build-date: 2010-12-08 10:54:21 -0600
 revno: 491
 branch-nick: brawler-wrk

 So that's why I said I "tried to work in the repo projects which
 doesn't seem to work."

 BTW, note that my "bzr version" shows:

 Bazaar (bzr) 2.2.1
  Python interpreter: /usr/local/bin/python 2.7.0
  Python standard library: /usr/lib/python2.6
  Platform: Linux-2.6.35-22-generic-x86_64-with-Ubuntu-10.10-maverick
  bzrlib: /usr/local/lib/python2.7/site-packages/bzrlib
  Bazaar configuration: /usr/local/people/tbrowde/.bazaar
  Bazaar log file: /usr/local/people/tbrowde/.bzr.log

Any ideas?

Thanks.

-Tom

Thomas M. Browder, Jr.
Niceville, Florida
USA