brz-git

Merge lp://staging/~jelmer/brz-git/diverged-branches into lp://staging/brz-git

  1. diverged-branches
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 1912
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp://staging/~jelmer/brz-git/diverged-branches
Merge into: lp://staging/brz-git
Diff against target: 358 lines (+118/-26)
8 files modified
branch.py (+14/-6)
fetch.py (+1/-1)
interrepo.py (+11/-7)
push.py (+31/-0)
refs.py (+15/-10)
remote.py (+12/-2)
tests/test_remote.py (+31/-0)
transportgit.py (+3/-0)
To merge this branch: bzr merge lp://staging/~jelmer/brz-git/diverged-branches
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+342481@code.staging.launchpad.net

Commit message

Check for diverged branches during push.

Description of the change

Check for diverged branches during push.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Rubberstamp! Proposer approves of own proposal.

review: Approve

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

to all changes: