lp:~jelmer/bzr-builddeb/merge-upstream-hook

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:bzr-builddeb at revision 532

James Westby: Approve on 2011-02-28

Diff: 69 lines (+26/-1)

4 files modified

cmds.py (+1/-0)
debian/changelog (+2/-1)
doc/user_manual/hooks.rst (+5/-0)
tests/blackbox/test_merge_upstream.py (+18/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #657501: Hook for merge_upstream

Medium

Fix Released

Link a bug report

Related blueprints

528. By Jelmer Vernooij on 2011-02-27

A hook for 'bzr merge-upstream' has been added. LP: #657501

527. By Jelmer Vernooij on 2011-02-27

When building with distribution set to UNRELEASED, it is now assumed
the build is targetted at the same distribution as the build before.

526. By James Westby on 2011-02-23

Remove the unneeded changes file.

525. By James Westby on 2011-02-23

Fix the version in debian/changelog and info.py. Thanks Max.

524. By Jelmer Vernooij on 2011-02-21

Merge removal of dependency on inefficient Branch.revision_history().

523. By Jelmer Vernooij on 2011-02-21

Merge fix for upstream branch no longer defaulting to '.'.

522. By Jelmer Vernooij on 2011-02-21

Merge fix for upstream version strings as byte strings.

521. By Jelmer Vernooij on 2011-02-21

Merge fix for NoSuchTag.

520. By Jelmer Vernooij on 2011-02-11

Merge build fixes.

519. By Jelmer Vernooij on 2011-02-11

Merge addition of more PristineTarSource tests.