merge --uncommitted ignores specific file

Bug #136890 reported by Robert Collins
4
Affects Status Importance Assigned to Milestone
Bazaar
Fix Released
High
Unassigned

Bug Description

I just did 'bzr merge --uncommitted ../path/to/bzrlib/tests/test_foo.py

There were changes to that file, and to others. I expected only the
changes to that file to be merged but instead all changes there were not
committed were merged.

 affects /products/bzr
--
GPG key available at: <http://www.robertcollins.net/keys.txt>.

Martin Pool (mbp)
Changed in bzr:
importance: Undecided → High
Revision history for this message
Lukáš Lalinský (luks) wrote :

Fixed in bzr.dev@3022, released in 1.0rc1.

Changed in bzr:
status: New → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.