lp:~slyguy/bzr/bug-855155

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:bzr

Richard Wilbur: Disapprove (superceded) on 2015-05-06

Diff: 50 lines (+29/-3)

2 files modified

bzrlib/dirstate.py (+12/-3)
bzrlib/tests/blackbox/test_uncommit.py (+17/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6580. By Brian de Alwis on 2013-05-27

Add test for bug 855155 (comment 26)

6579. By Brian de Alwis on 2013-01-16

Fix DirState._update_basis_apply_adds() to handle adds to empty directories

6578. By Patch Queue Manager <email address hidden> on 2013-05-27

(vila) Handle empty quoted strings in command lines and various
 cleanups (Vincent Ladeuil)

6577. By Patch Queue Manager <email address hidden> on 2013-05-27

(vila) Empty arguments in EDITOR are now properly preserved. (Vincent
 Ladeuil)

6576. By Patch Queue Manager <email address hidden> on 2013-05-25

(vila) Add __iter__ to http ResponseFile (Vincent Ladeuil)

6575. By Patch Queue Manager <email address hidden> on 2013-05-23

(jameinel) Merge bzr/2.5 into trunk. (John A Meinel)

6574. By Patch Queue Manager <email address hidden> on 2013-05-20

(jameinel) Fix CVE 2013-2009. Avoid allowing multiple wildcards in a single
 SSL cert hostname segment. (Andrew Starr-Bochicchio)

6573. By Patch Queue Manager <email address hidden> on 2013-02-07

(jameinel) Fix bug #1107464,
 to allow the test suite to pass when python-apport is installed. (Dylan
 McCall)

6572. By Patch Queue Manager <email address hidden> on 2012-12-10

(vila) Fix LC_ALL=C test failures related to utf8 stderr encoding (Vincent
 Ladeuil)

6571. By Patch Queue Manager <email address hidden> on 2012-10-25

(gz) Set approved revision and vote "Approve" when using lp-propose
 --approve (Jonathan Lange)