/brz/remove-bazaar : revision 2984.1.1

Committer: John Arbash Meinel
Date: 2007-11-15 01:07:51 UTC
mto: This revision was merged to the branch mainline in revision 2998 .
Revision ID: john@arbash-meinel.com-20071115010751-v1v42nuv5es0ybxx

To get this branch, use:

bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

Viewing changes to bzrlib/commit.py

Fix bug #161131: Correct DirState._discard_merge_parents logic.
When there were 2 entries to remove, it was removing all entries.

added added

removed removed