git-ubuntu

Merge ~racb/git-ubuntu:preserve-mps-on-reimport into git-ubuntu:master

  1. Git
  2. lp:~racb/git-ubuntu
  3. preserve-mps-on-reimport
  4. Merge into master
Proposed by Robie Basak
Status: Merged
Merged at revision: 7a60e7f1373a7480a507ac7e0e7da8b53ca968c0
Proposed branch: ~racb/git-ubuntu:preserve-mps-on-reimport
Merge into: git-ubuntu:master
Diff against target: 63 lines (+21/-31)
1 file modified
gitubuntu/importer.py (+21/-31)
Reviewer Review Type Date Requested Status
Bryce Harrington Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+383142@code.staging.launchpad.net

Commit message

Make Jenkins happy

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:ca52d3e2caa598a9b740271cde7d56b0c325f535
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/504/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/504//rebuild

review: Approve (continuous-integration)
Revision history for this message
Robie Basak (racb) wrote :

This now merge-conflicts against the other branches landed into master, so I've force pushed a rebase with conflicts resolved. The change remains the same.

Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:7a60e7f1373a7480a507ac7e0e7da8b53ca968c0
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/507/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/507//rebuild

review: Approve (continuous-integration)
Revision history for this message
Bryce Harrington (bryce) wrote :

Ok, --prune does indeed seem to work for this. Nice improvement for users.

This will be used infrequently, and run manually, so if there's issues will be easily spotted and fixed when they crop up.

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

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