Breezy

Merge lp://qastaging/~jelmer/brz/switch-git-bug into lp://qastaging/brz/3.0

  1. switch-git-bug
  2. Merge into 3.0
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp://qastaging/~jelmer/brz/switch-git-bug
Merge into: lp://qastaging/brz/3.0
Diff against target: 341 lines (+127/-32)
9 files modified
breezy/builtins.py (+11/-8)
breezy/bzr/bzrdir.py (+10/-2)
breezy/controldir.py (+4/-4)
breezy/git/dir.py (+13/-0)
breezy/git/tests/test_blackbox.py (+25/-0)
breezy/git/workingtree.py (+19/-12)
breezy/switch.py (+2/-5)
breezy/tests/per_controldir_colo/test_supported.py (+38/-1)
doc/en/release-notes/brz-3.0.txt (+5/-0)
To merge this branch: bzr merge lp://qastaging/~jelmer/brz/switch-git-bug
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+365990@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2019-04-13.

Commit message

Fix switching between branches while preserving uncommitted changes in git.

Description of the change

Fix switching between branches while preserving uncommitted changes in git.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.0/job/brz-3.0-land/34/

Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/brz-3.0/job/brz-3.0-land/49/

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