Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge2.out @ 786:902b12d55751
Fix the directory and revlog collision problem
This adds escaping for directory names so that directory foo.i doesn't
collide with the revision data for file foo.
| author | mpm@selenic.com |
|---|---|
| date | Wed, 27 Jul 2005 18:50:32 -0800 |
| parents | 61ed30e82b27 |
| children | 1f9ec150a476 8f5637f0a0c0 0902ffece4b4 |
line wrap: on
line source
+ mkdir t + cd t + hg init + echo This is file a1 + hg add a + hg commit -m 'commit #0' -d '0 0' + echo This is file b1 + hg add b + hg commit -m 'commit #1' -d '0 0' + rm b + hg update 0 + echo This is file b2 + hg add b + hg commit -m 'commit #2' -d '0 0' + cd .. + /bin/rm -rf t + mkdir t + cd t + hg init + echo This is file a1 + hg add a + hg commit -m 'commit #0' -d '0 0' + echo This is file b1 + hg add b + hg commit -m 'commit #1' -d '0 0' + rm b + hg update 0 + echo This is file b2 + hg commit -A -m 'commit #2' -d '0 0' adding b + cd .. + /bin/rm -rf t + mkdir t + cd t + hg init + echo This is file a1 + hg add a + hg commit -m 'commit #0' -d '0 0' + echo This is file b1 + hg add b + hg commit -m 'commit #1' -d '0 0' + rm b + hg remove b + hg update 0 + echo This is file b2 + hg commit -A -m 'commit #2' -d '0 0' adding b + cd .. + /bin/rm -rf t