Viewing all changes in revision 6104.1.1.
- Committer: John Arbash Meinel
- Date: 2011-08-26 11:35:50 UTC
- mfrom: (6015.24.9 2.4-get_cached_parent_map-388269)
- mto: This revision was merged to the branch mainline in revision 6105.
- Revision ID: john@arbash-meinel.com-20110826113550-jtk2c6s2is9b0th4
Merge fix for bug #388269 into trunk, resolve conflicts and add release notes.
- files added:
- bzrlib/tests/blackbox/test_branches.py
- files modified:
- bzrlib/add.py
expand all
collapse all
added
removed
