Viewing all changes in revision 3514.4.31.
- Committer: John Arbash Meinel
- Date: 2008-07-31 19:34:27 UTC
- mto: (3697.7.4 1.7)
- mto: This revision was merged to the branch mainline in revision 3748.
- Revision ID: john@arbash-meinel.com-20080731193427-94lq166eeytf8tts
Add expected failures for cases where we should be looking at more than
just BASE + LCAs, such as intermediate LCAs, or the whole per-file/attribute graph.
They are fairly unlikely, but it is good to know that we don't handle them yet.
just BASE + LCAs, such as intermediate LCAs, or the whole per-file/attribute graph.
They are fairly unlikely, but it is good to know that we don't handle them yet.
- files modified:
- bzrlib/tests/test_merge.py
expand all
collapse all
added
removed
