No subject

I was told revision 9 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:
  repository checkout root: .
        checkout of branch:
bzr+ssh://bigtom/usr/local/bzr-repos-local-and-ox/brawler-wrk/
         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:
  repository checkout root: .
        checkout of branch: svn+ssh://localhost/usr/local/svn-repos/brawler=
-wrk
         shared repository: /usr/local/bzr-repos-local-and-ox

Related branches:
  submit 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."

>> 1. =A0The shared repos have a ".bz" subdirectory at the top level as
>> well as one in each project. =A0Can that top-level subdirectory be
>> removed in order to removed the "shared repository" status?
>
> No. =A0The actual revisions of the branches that are in directories under=
 the
> shared repository (the branches also have .bzr directories at their roots=
)
> store their revisions inside the top-level .bzr directory. =A0In order to
> remove the branches' dependence on the shared repository, use the command
> ``bzr reconfigure --standalone`` inside of each one. =A0To check that you=
 have
> been successful, ``bzr info`` in each branch should have no mention of
> "shared repository" or "Repository tree".

Good info.

> If it is possible to use the project repos on the server as
> working directories, how do I do that?  If I can do that, should I do
> that, i.e., is that not a good practice?
...
> Yes, you can do that. =A0As I said above, I find it easier to work in
> checkouts of the branches when I am working directly on the "central
> server", but I don't have a particularly good argument for doing so. (My
> only sense is that is maintains a separation between the "official" versi=
on
> of a branch and any of my working copies. =A0Thus it keeps all of the wor=
king
> copies as peers, no matter which computer they are on.) Perhaps someone e=
lse
> here can express a clearer reason.

Also good info.

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

All very helpful, Neil--thank you very much!

Regards,

-Tom

Thomas M. Browder, Jr.
Niceville, Florida
USA