Viewing all changes in revision 5847.4.25.
- Committer: John Arbash Meinel
- Date: 2011-05-19 11:08:25 UTC
- 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-20110519110825-bfdizt740uglh684
Trap an InconsistentDelta case. add can try to add another
entry to the same location. Not too bad to detect, since we just need
to look at nearby locations.
entry to the same location. Not too bad to detect, since we just need
to look at nearby locations.
- files modified:
- bzrlib/dirstate.py
expand all
collapse all
added
removed
