lp:~jelmer/brz-debian/upstream-subpath

Branch merges

Propose for merging

Ready for review for merging into lp:brz-debian

Breezy developers: Pending requested 2023-01-22

Diff: 1392 lines (+232/-169)

16 files modified

__init__.py (+7/-7)
cmds.py (+15/-9)
import_dsc.py (+60/-38)
import_uncommitted.py (+3/-2)
merge_package.py (+10/-5)
merge_upstream.py (+6/-6)
move_orphaned.py (+3/-1)
new_upstream.py (+15/-10)
revspec.py (+1/-1)
tests/blackbox/test_merge_upstream.py (+1/-1)
tests/test_config.py (+0/-1)
tests/test_import_dsc.py (+47/-45)
tests/test_upstream.py (+14/-12)
upstream/__init__.py (+1/-1)
upstream/branch.py (+26/-18)
upstream/pristinetar.py (+23/-12)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1591. By Jelmer Vernooij on 2023-01-27

Report formatting-unpreservable diff when possible.

1590. By Jelmer Vernooij on 2023-01-22

Support merging upstream with subpath (for build_type==merge)

1589. By Jelmer Vernooij on 2023-01-22

Add specific exception for merging of upstream subpaths not working.

1588. By Jelmer Vernooij on 2023-01-19

Fix class name.

1587. By Jelmer Vernooij on 2023-01-18

Improve error message when version and source format mismatch.

1586. By Jelmer Vernooij on 2023-01-15

handle ConflictsInTree.

1585. By Jelmer Vernooij on 2023-01-12

Drop old compat code.

1584. By Jelmer Vernooij on 2023-01-12

Fix test.

1583. By Jelmer Vernooij on 2023-01-12

Upgade to python 3.9.

1582. By Jelmer Vernooij on 2023-01-12

ignore browser fields