lp:~mbp/bzr/integration

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr at revision 6047

bzr-core: Pending requested 2011-08-02

Diff: 643 lines (+314/-35)

18 files modified

bzrlib/config.py (+12/-0)
bzrlib/dirstate.py (+38/-26)
bzrlib/errors.py (+13/-0)
bzrlib/help_topics/en/configuration.txt (+14/-0)
bzrlib/index.py (+5/-0)
bzrlib/osutils.py (+11/-0)
bzrlib/repofmt/pack_repo.py (+14/-4)
bzrlib/tests/__init__.py (+23/-0)
bzrlib/tests/test_http.py (+66/-0)
bzrlib/tests/test_selftest.py (+12/-0)
bzrlib/tests/test_transport.py (+19/-0)
bzrlib/transport/__init__.py (+25/-1)
bzrlib/transport/http/__init__.py (+1/-1)
bzrlib/transport/http/response.py (+8/-1)
bzrlib/transport/local.py (+1/-2)
doc/developers/testing.txt (+17/-0)
doc/en/release-notes/bzr-2.3.txt (+3/-0)
doc/en/release-notes/bzr-2.4.txt (+32/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6333. By Martin Pool on 2011-12-01

merge news

6332. By Patch Queue Manager <email address hidden> on 2011-12-01

allow lazily registered hooks to have their names appear in "bzr
 hooks" (bug 894609)

6331. By Patch Queue Manager <email address hidden> on 2011-11-30

(vila) Better deprecation warnings for _CompatabilityThunkFeature based test
 features (Vincent Ladeuil)

6330. By Patch Queue Manager <email address hidden> on 2011-11-30

(mbp) Pass specific_files to status hooks (Francis Devereux)

6329. By Patch Queue Manager <email address hidden> on 2011-11-29

(mbp) PackWriter: remove one possibly large string join (bug 890085 incr)
 (Martin Pool)

6328. By Patch Queue Manager <email address hidden> on 2011-11-29

(gz) Remove deprecated parts of bzrlib.errors and other cleanups (Martin
 Packman)

6327. By Patch Queue Manager <email address hidden> on 2011-11-29

(gz) Require dulwich when bundling bzr-git with setup.py py2exe (Martin
 Packman)

6326. By Patch Queue Manager <email address hidden> on 2011-11-29

(vila) Fix various typos (Vincent Ladeuil)

6325. By Patch Queue Manager <email address hidden> on 2011-11-29

(jelmer) Allow registering new location aliases. (Jelmer Vernooij)

6324. By Patch Queue Manager <email address hidden> on 2011-11-29

(vila) Fix news entries to avoid confusion. In particular,
 bug #819604 has not landed in older releases yet (Vincent Ladeuil)