Incompatibility Ubuntu Linux Gutsy bzr and win32 bzr with bzr+ssh transport

[RayH]

I have successfully used BZR for Win32 with Ubuntu Linux using SFTP transport.

I would now like to use bzr+ssh transport to try and get over the sticky bit limitation of sftp screwing up our shared repository when two of us are working on teh same project but with different Linujx usernames.

I checked whether I had the latest Ubuntu release (using apt-get update bzr) and windows release. But there appears to be a version incompatability here. Here's the session.

C:\NMS\Globis\test>bzr checkout bzr+ssh://<email address hidden>:YYYY/%2f/home/
bzr/test/trunk test

C:\NMS\Globis\test>cd test
C:\NMS\Globis\test>edit test4.txt

C:\NMS\Globis\test>dir
 Volume in drive C is VAIO
 Volume Serial Number is BCDB-2546

 Directory of C:\NMS\Globis\test

12/05/2008 19:18 <DIR> .
12/05/2008 19:18 <DIR> ..
12/05/2008 19:17 6 .bzrignore
12/05/2008 19:17 89 test.txt
12/05/2008 19:17 22 test2.txt
12/05/2008 19:17 20 test3.txt
12/05/2008 19:18 22 test4.txt
               5 File(s) 159 bytes
               2 Dir(s) 2,753,191,936 bytes free

C:\NMS\Globis\test>bzr add *.txt
added test4.txt

C:\NMS\Globis\test>bzr update
Connected (version 2.0, client OpenSSH_4.6p1)
Authentication (publickey) successful!
Secsh channel 1 opened.
Tree is up to date at revision 4.

C:\NMS\Globis\test>bzr commit -m "test using bzr+ssh protocol to see if this is
better than sftp for permssions."
Connected (version 2.0, client OpenSSH_4.6p1)
Authentication (publickey) successful!
Secsh channel 1 opened.
Committing to: bzr+ssh://<email address hidden>:1022///home/bzr/test/trunk/
modified test.txt
added test4.txt
Server is too old for fast get_parent_map, reconnecting. (Upgrade the server t
 Bazaar 1.2 to avoid this)
Connected (version 2.0, client OpenSSH_4.6p1)
Authentication (publickey) successful!
Secsh channel 1 opened.
bzr: ERROR: exceptions.AssertionError: 4 != 5

Traceback (most recent call last):
  File "bzrlib\commands.pyc", line 834, in run_bzr_catch_errors
  File "bzrlib\commands.pyc", line 790, in run_bzr
  File "bzrlib\commands.pyc", line 492, in run_argv_aliases
  File "bzrlib\builtins.pyc", line 2355, in run
  File "bzrlib\decorators.pyc", line 165, in write_locked
  File "bzrlib\workingtree_4.pyc", line 246, in commit
  File "bzrlib\decorators.pyc", line 165, in write_locked
  File "bzrlib\mutabletree.pyc", line 187, in commit
  File "bzrlib\commit.pyc", line 393, in commit
  File "bzrlib\remote.pyc", line 1506, in set_last_revision_info
  File "bzrlib\decorators.pyc", line 165, in write_locked
  File "bzrlib\branch.pyc", line 1398, in set_last_revision_info
AssertionError: 4 != 5

bzr 1.3 on python 2.5.2.final.0 (win32)
arguments: ['bzr', 'commit', '-m', 'test using bzr+ssh protocol to see if this
s better than sftp for permssions.']
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
  launchpad C:\Program Files\Bazaar\plugins\launchpad [unknown]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.

C:\NMS\Globis\test>

and the version info

WIN32
C:\NMS\Globis\test>bzr --version
Bazaar (bzr) 1.3
  Python interpreter: C:\Program Files\Bazaar\python25.dll 2.5.2.final.0
  Python standard library: C:\Program Files\Bazaar\lib\library.zip
  bzrlib: C:\Program Files\Bazaar\lib\library.zip\bzrlib
  Bazaar configuration: C:\Documents and Settings\Ray\Application Data\bazaar\2.
0
  Bazaar log file: C:\Documents and Settings\Ray\My Documents\.bzr.log

Copyright 2005, 2006, 2007, 2008 Canonical Ltd.
http://bazaar-vcs.org/

bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.

C:\NMS\Globis\test>

Linux Ubuntu Gutsy Gibbon

root@XXXXXX:/home/bzr# bzr --version
Bazaar (bzr) 0.90.0
  Python interpreter: /usr/bin/python 2.5.1.final.0
  Python standard library: /usr/lib/python2.5
  bzrlib: /usr/lib/python2.5/site-packages/bzrlib
  Bazaar configuration: /home/ray/.bazaar
  Bazaar log file: /home/ray/.bzr.log

Copyright 2005, 2006, 2007 Canonical Ltd.
http://bazaar-vcs.org/

bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.

root@XXXXXX:/home/bzr#
root@XXXXXX:/home/bzr# uname -a
Linux globis01 2.6.22-14-generic #1 SMP Tue Feb 12 02:46:46 UTC 2008 x86_64 GN
/Linux

[John A Meinel (jameinel)]

The assertion error is bug #177855. If you upgrade your server, you probably won't run into it. If you upgrade your branches, you also won't run into it. If you upgrade to the latest client, it should also work around this issue.

If you want the latest versions for gutsy, you can add the Launchpad PPA at
https://launchpad.net/~bzr/+archive

1.5rc1 is available, which should have a fix for thes.

[RayH (ray-hunter)]

Here's a diff just to show you what I edited before the commit.

C:\NMS\Globis\test>bzr diff
=== modified file 'test.txt'
--- test.txt 2008-05-12 16:57:18 +0000
+++ test.txt 2008-05-12 17:17:57 +0000
@@ -1,2 +1,4 @@
 this is a test
 altered by Ray 12/5/2008
+
+the file was uploaded with bzr+ssh protocol

=== added file 'test4.txt'
--- test4.txt 1970-01-01 00:00:00 +0000
+++ test4.txt 2008-05-12 17:18:19 +0000
@@ -0,0 +1,1 @@
+New file on 20080512

C:\NMS\Globis\test>

[RayH (ray-hunter)]

OK Thanks very much for the tip. I'll give it a whirl and report back.

Not so handy that the latest version isn't propogated to the standard Ubuntu tree yet.

[RayH (ray-hunter)]

OK Upgrading just the server solved the issue. There was no need to upgrade the windows client for this particular issue (although I'll do that anyway)

Just for the real amateurs amongst us (me included)

Here's what I did to install the latest version:

Checked version name of Ubuntu: Gutsy Gibbon (not Intrepid yet!)

Added following repository at the _top_ of /etc/apt/sources.list

deb http://ppa.launchpad.net/bzr/ubuntu gutsy main
deb-src http://ppa.launchpad.net/bzr/ubuntu gutsy main

apt-get update
apt-get remove bzr
apt-get install bzr
[answer y to the the following warning]
WARNING: The following packages cannot be authenticated!
Install these packages without verification [y/N]? y

thanks!