confusing merge output on conflicts
Bug #37840 reported by
Martin Pitt
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
Fix Released
|
Medium
|
Unassigned | ||
Bug Description
I just merged my postgresql-common tree; with the version that's currently in dapper (0.8~2006032307
$ bzr merge
Using saved location: /home/martin/
\ [====== ] Merge phase 0/5Inventory ok.
- [======
1 conflicts encountered.
First, there are missing line breaks before the status messages, and second, the 2/5 and the incomplete progress bar seem to indicate that the merging was not completed (although it was).
| Changed in bzr: | |
| status: | Unconfirmed → Fix Committed |
| Changed in bzr: | |
| status: | Fix Committed → Fix Released |
To post a comment you must log in.
