lp:~ryorke/bzr/202374-pull-update-showbase

Branch merges

Merged into lp:bzr at revision 5455

Martin Packman (community): Approve on 2010-09-28

bzr-core: Pending requested 2010-09-29

Diff: 263 lines (+118/-12)

5 files modified

NEWS (+9/-0)
bzrlib/builtins.py (+16/-5)
bzrlib/tests/blackbox/test_pull.py (+43/-0)
bzrlib/tests/blackbox/test_update.py (+38/-0)
bzrlib/workingtree.py (+12/-7)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #202374: pull and update should accept --show-base

Medium

Fix Released

Link a bug report

Related blueprints

5432. By Rory Yorke on 2010-09-27

Changes as per Martin [gz]'s review.

Added NEWS entry.

Minor: explicitly close files written to in tests, fixed whitespace.

5431. By Rory Yorke on 2010-09-24

Added --show-base to pull and update (bug 202374).

Behaviour copied from merge. Tests in
tests/blackbox/test_{pull,update}.py

5430. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-16

(spiv) Remove some code in bzrlib/tests/__init__.py that is no longer used.
 (Andrew Bennetts)

5429. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-16

(spiv) Remove some cruft apparently leftover from previous refactorings of
 InterDifferingSerializer. (Andrew Bennetts)

5428. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-16

(spiv) Fix random test_bad_connection_ssh failures (Vincent Ladeuil)

5427. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-15

(jameinel) Fix bug #638034,
 Inventory.entries() should handle the empty inventory. (Daniel Knittl-Frank)

5426. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-15

(mbp) add structured confirmations to the ui_factory (Martin Pool)

5425. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-14

(gz) Warn if platform doesn't support selftest --parallel=fork (Martin [gz])

5424. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-14

(jelmer) Allow control directories to not support create_workingtree(),
 even if they are local. (Jelmer Vernooij)

5423. By Canonical.com Patch Queue Manager <email address hidden> on 2010-09-14

(mbp) split out ProgressRecordingUIFactory (Martin Pool)