lp:~jelmer/brz/cmp

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:brz

Jelmer Vernooij: Approve on 2022-09-22

Diff: 80 lines (+7/-16)

4 files modified

breezy/bzr/conflicts.py (+3/-6)
breezy/plugins/bash_completion/bashcomp.py (+0/-3)
breezy/plugins/zsh_completion/zshcomp.py (+1/-4)
breezy/transport/__init__.py (+3/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

7644. By Jelmer Vernooij on 2022-09-22

Remove obsolete __cmp__

7643. By Jelmer Vernooij on 2022-09-22

Fix typo in zsh-completion help.

7642. By Jelmer Vernooij on 2022-09-22

Avoid deprecated distutils.version.

Merged from https://code.launchpad.net/~jelmer/brz/avoid-deprecated/+merge/430255

7641. By Alexander Grund <email address hidden> on 2022-09-17

Add missing controldir import to branch_updater

Merged from https://code.launchpad.net/~jelmer/brz/patch-1/+merge/430054

7640. By Alexander Grund <email address hidden> on 2022-09-17

fastimport: Open stdin in binary mode

Merged from https://code.launchpad.net/~jelmer/brz/patch-2/+merge/430055

7639. By Jelmer Vernooij on 2022-09-14

Fix import of BranchReferenceLoop.

Merged from https://code.launchpad.net/~jelmer/brz/symref/+merge/429915

7638. By Jelmer Vernooij on 2022-09-14

Add a docker file.

Merged from https://code.launchpad.net/~jelmer/brz/container/+merge/429830

7637. By Jelmer Vernooij on 2022-09-14

Fix exception initialization for unsupported formats

Merged from https://code.launchpad.net/~jelmer/brz/cvsdir/+merge/429907

7636. By Jelmer Vernooij on 2022-09-14

Fix compatibility with modern dulwich.

Merged from https://code.launchpad.net/~jelmer/brz/pack-changes/+merge/429890

7635. By Jelmer Vernooij on 2022-09-14

gitlab: Fix syntax error dealing with merge proposal conflicts.

Merged from https://code.launchpad.net/~jelmer/brz/mp-reason/+merge/429898