Difference between bzr-1.1.tar.gz and bzr branch lp:bzr/1.1

Asked by Matthias Müller-Reineke

Which / where is the branch which contains exactly the official 1.1 release?

From my shell (Ubuntu 6.06):

mueller@dhcppc4:~$ bzr branch lp:bzr/1.1
bzr-gtk is not up to date with installed bzr version 1.0.0.candidate.1.
There should be a newer version available, e.g. 1.0.
Unable to load plugin 'gtk' from '/home/mueller/.bazaar/plugins'
lp:bzr/1.1 is redirected to http://bazaar.launchpad.net/~mbp/bzr/bzr.1.1/

Branched 3171 revision(s).
mueller@dhcppc4:~$ mkdir bzr
mueller@dhcppc4:~$ mv 1.1 bzr
mueller@dhcppc4:~$ tar xzf bzr-1.1.tar.gz
mueller@dhcppc4:~$ diff -r bzr-1.1 bzr/1.1/|more
Nur in bzr/1.1/: .bzr.
Nur in bzr/1.1/: .bzrignore.
Nur in bzr-1.1/bzrlib: _dirstate_helpers_c.c.
Nur in bzr-1.1/bzrlib: _knit_load_data_c.c.
diff -r bzr-1.1/bzrlib/repofmt/pack_repo.py bzr/1.1/bzrlib/repofmt/pack_repo.py
1651,1653c1651,1654
< self._new_pack.abort()
< self._remove_pack_indices(self._new_pack)
< self._new_pack = None
---
> if self._new_pack is not None:
> self._new_pack.abort()
> self._remove_pack_indices(self._new_pack)
> self._new_pack = None
diff -r bzr-1.1/bzrlib/tests/TestUtil.py bzr/1.1/bzrlib/tests/TestUtil.py
79a80,81
> # Memoize test names by test class dict
> test_func_names = {}
124a127,136
> def getTestCaseNames(self, test_case_class):
> test_fn_names = self.test_func_names.get(test_case_class, None)
> if test_fn_names is not None:
> # We already calculate that
> return test_fn_names
>
> test_fn_names = unittest.TestLoader.getTestCaseNames(self,
> test_case_class)
> self.test_func_names[test_case_class] = test_fn_names
> return test_fn_names
diff -r bzr-1.1/NEWS bzr/1.1/NEWS
71a72,74
> * Avoid AttributeError when unlocking a pack repository when an error occurs.
> (Martin Pool, #180208)
>
160a164,166
> * Reduce selftest overhead to establish test names by memoization.
> (Vincent Ladeuil)
>
diff -r bzr-1.1/README bzr/1.1/README
29c29
< * Easy to use and intuitive.
---
> * Easy to use and intuitive.
31,33c31,33
< Only five commands are needed to do all basic operations, and all
< commands have documentation accessible via 'bzr help command'.
< Bazaar's interface is also easy to learn for CVS and Subversion users.
---
> Only five commands are needed to do all basic operations, and all
> commands have documentation accessible via 'bzr help command'.
> Bazaar's interface is also easy to learn for CVS and Subversion users.
35c35
< * Robust and reliable.
---
> * Robust and reliable.
37,39c37,39
< Bazaar is developed under an extensive test suite. Branches can be
< checked and verified for integrity at any time, and revisions can be
< signed with PGP/GnuPG.
---
> Bazaar is developed under an extensive test suite. Branches can be
> checked and verified for integrity at any time, and revisions can be
> signed with PGP/GnuPG.
60,61c60,61
< Changes will never be merged more than once, conflicts will be
< minimized, and identical changes are dealt with well.
---
> Changes will never be merged more than once, conflicts will be
> minimized, and identical changes are dealt with well.
mueller@dhcppc4:~$

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Solved by:
Vincent Ladeuil
Solved:
Last query:
Last reply:
Revision history for this message
Best Vincent Ladeuil (vila) said :
#1

There was an error that leads to divergence between the tar file and the branch for the 1.1 release. The differences are not significant (there is an additional fix in the branch but it's for unusual cases). The tar file is considered official.

Anyway, 1.2rc1 is out now :)

Revision history for this message
Matthias Müller-Reineke (matthias-mueller-reineke) said :
#2

Thanks vila, that solved my question.