Bazaar

Merge lp://staging/~davidstrauss/bzr/lcas-subtree-workaround into lp://staging/bzr

  1. lcas-subtree-workaround
  2. Merge into bzr.dev
Proposed by David Strauss
Status: Work in progress
Proposed branch: lp://staging/~davidstrauss/bzr/lcas-subtree-workaround
Merge into: lp://staging/bzr
Diff against target: 121 lines (+19/-8)
2 files modified
bzrlib/graph.py (+5/-2)
bzrlib/merge.py (+14/-6)
To merge this branch: bzr merge lp://staging/~davidstrauss/bzr/lcas-subtree-workaround
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+49578@code.staging.launchpad.net

Commit message

This should not be committed to core.

Description of the change

This is not so much a merge proposal as much as a "view the diff on Launchpad" abuse of the merge proposal system.

To post a comment you must log in.

Unmerged revisions

5477. By David Strauss

Merge from trunk

5476. By David Strauss

Workaround for LCAS with subtrees.

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.