bzr-builddeb

Merge lp://staging/~jelmer/bzr-builddeb/295274-merge-upstream-no-version into lp://staging/bzr-builddeb

  1. 295274-merge-upstream-no-version
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 499
Proposed branch: lp://staging/~jelmer/bzr-builddeb/295274-merge-upstream-no-version
Merge into: lp://staging/bzr-builddeb
Prerequisite: lp://staging/~jelmer/bzr-builddeb/get-latest-version
Diff against target: 349 lines (+117/-86)
4 files modified
cmds.py (+83/-82)
debian/changelog (+3/-0)
tests/test_upstream.py (+17/-0)
upstream.py (+14/-4)
To merge this branch: bzr merge lp://staging/~jelmer/bzr-builddeb/295274-merge-upstream-no-version
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+47216@code.staging.launchpad.net

Description of the change

When running "bzr merge-upstream" it is no longer necessary to specify a version string if there is a debian/watch file.

To post a comment you must log in.
lp://staging/~jelmer/bzr-builddeb/295274-merge-upstream-no-version updated
508. By Jelmer Vernooij

Add --snapshot option to merge-upstream.

509. By Jelmer Vernooij

Remove unused method.

Revision history for this message
James Westby (james-w) wrote :

A test would be nice, but it's very tricky so I think we'll have to live without it.

Thanks,

James

review: Approve
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

> A test would be nice, but it's very tricky so I think we'll have to live
> without it.
I'll work on some more tests for it. This code is fairly tricky to get right, too, so I think it's worth adding tests.

lp://staging/~jelmer/bzr-builddeb/295274-merge-upstream-no-version updated
510. By Jelmer Vernooij

Merge fix for warnings tag.

511. By Jelmer Vernooij

merge lp:bzr-builddeb.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches