pending merges are not viewed as tree changes
Bug #426344 reported by
Vincent Ladeuil
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Fix Released
|
High
|
Vincent Ladeuil | ||
Bug Description
Raised in bug #405264, there are still two cases where pending merges are not handled as uncommitted changes:
- merge (without --force)
- remove-tree
Related branches
lp:~vila/bzr/426344-check-pending-merges
- John A Meinel: Approve
- Diff: None lines
lp:~vila/bzr/integration
- Vincent Ladeuil: Approve
-
Diff: 31 lines (+4/-4)2 files modifiedbzrlib/lazy_regex.py (+3/-3)
doc/en/release-notes/bzr-2.7.txt (+1/-1)
| Changed in bzr: | |
| status: | New → Confirmed |
| assignee: | nobody → Vincent Ladeuil (vila) |
| importance: | Undecided → High |
| tags: | added: mysql |
| Changed in bzr: | |
| status: | Confirmed → In Progress |
| Changed in bzr: | |
| status: | In Progress → Fix Committed |
| Changed in bzr: | |
| milestone: | none → 2.1 |
| status: | Fix Committed → Fix Released |
| Changed in bzr: | |
| milestone: | 2.1.0 → 2.1b1 |
Revision history for this message
| GuilhemBichot (guilhem-bichot) wrote | #1 |
To post a comment you must log in.
I confirm that it works now