lp://staging/~jelmer/brz/git-submodule

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/brz

Jelmer Vernooij: Approve on 2020-01-17

Diff: 463 lines (+146/-43)

15 files modified

breezy/branch.py (+10/-12)
breezy/builtins.py (+6/-5)
breezy/bzr/branch.py (+8/-0)
breezy/bzr/bzrdir.py (+7/-1)
breezy/bzr/workingtree.py (+7/-0)
breezy/bzr/workingtree_4.py (+18/-14)
breezy/git/branch.py (+15/-0)
breezy/git/dir.py (+6/-1)
breezy/git/fetch.py (+3/-3)
breezy/git/workingtree.py (+33/-0)
breezy/merge.py (+1/-1)
breezy/tests/blackbox/test_branch.py (+15/-0)
breezy/tests/blackbox/test_reference.py (+2/-0)
breezy/tests/per_branch/test_branch.py (+5/-6)
breezy/workingtree.py (+10/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

7454. By Jelmer Vernooij on 2020-01-17

Use strip_segment_parameters.

7453. By Jelmer Vernooij on 2020-01-17

Ignore missing nested trees.

7452. By Jelmer Vernooij on 2020-01-17

Fix typo.

7451. By Jelmer Vernooij on 2020-01-17

Import from gitmodules.

7450. By Jelmer Vernooij on 2020-01-17

Use find_previous_path rather than id2path.

7449. By Jelmer Vernooij on 2020-01-17

Fix tree reference listing.

7448. By Jelmer Vernooij on 2020-01-17

Move reference info to Git.

7447. By Jelmer Vernooij on 2020-01-17

Fix cloning of git repositories with submodules.

7446. By Jelmer Vernooij on 2020-01-15

Add Hoster.merge_proposal_description_format and common function for determining title.

Merged from https://code.launchpad.net/~jelmer/brz/merge-proposal-text/+merge/377672

7445. By Jelmer Vernooij on 2020-01-13

Add basic svn plugin that warns the user when they attempt to access a svn working tree.

Merged from https://code.launchpad.net/~jelmer/brz/probe-svn/+merge/375183