Viewing all changes in revision 3514.4.28.
- Committer: John Arbash Meinel
- Date: 2008-07-30 22:37:49 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-20080730223749-wcofi4ccz4wzgkfk
More symlink tests.
Test that we properly track content changes for symlinks,
and that we merge them correctly.
Also add a test for the expected failure of the 3-way merge logic
on content of symlinks (and files.)
Test that we properly track content changes for symlinks,
and that we merge them correctly.
Also add a test for the expected failure of the 3-way merge logic
on content of symlinks (and files.)
- files modified:
- bzrlib/merge.py
expand all
collapse all
added
removed
