Viewing all changes in revision 5847.4.7.
- Committer: John Arbash Meinel
- Date: 2011-05-18 05:01:00 UTC
- mfrom: (5887 +trunk)
- mto: (5847.4.37 2.4-set-parent-trees-delta-282941)
- mto: This revision was merged to the branch mainline in revision 5900.
- Revision ID: john@arbash-meinel.com-20110518050100-fuip01rzev5kegtl
Merge bzr.dev 5887, to get the update_basis_by_delta changes
- files added:
- bzrlib/tests/blackbox/test_remember_option.py
- files modified:
- bzrlib/branch.py
expand all
collapse all
added
removed
