Viewing all changes in revision 5807.4.6.
- Committer: John Arbash Meinel
- Date: 2011-04-22 14:12:22 UTC
- mfrom: (5809 +trunk)
- mto: This revision was merged to the branch mainline in revision 5836.
- Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.
- files modified:
- bzrlib/_dirstate_helpers_pyx.pyx
expand all
collapse all
added
removed
