lp:~parthm/bzr/335033_and_300001

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr

Martin Pool: Approve on 2010-02-17

Diff: 205 lines (+74/-29)

4 files modified

NEWS (+5/-0)
bzrlib/bzrdir.py (+11/-2)
bzrlib/tests/blackbox/test_upgrade.py (+36/-6)
bzrlib/tests/test_upgrade.py (+22/-21)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #300001: existence of backup.bzr blocks running upgrade a second time	High	Fix Released
Bug #335033: ignore backup.bzr	Medium	Fix Released

Link a bug report

Related blueprints

5043. By Parth Malwankar on 2010-02-18

Fixed blackbox.test_info test failure.
This was happening as the backup.dir status is now
'ignored' instead of the earlier 'unknown'.

5042. By Parth Malwankar on 2010-02-15

updated NEWS

5041. By Parth Malwankar on 2010-02-15

added doc to test

5040. By Parth Malwankar on 2010-02-15

added explicit test for directory existance

5039. By Parth Malwankar on 2010-02-15

test updated to check for creation of backup.bzr.~2~ when backup.bzr.~1~ exists

5038. By Parth Malwankar on 2010-02-15

updated existing upgrade tests to work.

5037. By Parth Malwankar on 2010-02-15

name_gen now works with all transports.
coding convention fix (lower case local variables).

5036. By Parth Malwankar on 2010-02-15

fixes 335033.
works only locally

5035. By Canonical.com Patch Queue Manager <email address hidden> on 2010-02-12

(Matthew Fuller) Update docs for using 'switch' with a checkout

5034. By Canonical.com Patch Queue Manager <email address hidden> on 2010-02-12

(jam) Bug #303275, don't fail 'status --short' for unknown file kinds.