Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-manifest-merging @ 3986:f921bcba405d
Make test-manifest-merging less likely to delete the whole filesystem
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Fri, 22 Dec 2006 16:29:35 -0800 |
parents | be8efb6e1cc6 |
children | c137e21dba5a |
comparison
equal
deleted
inserted
replaced
3985:4874ca8a53c1 | 3986:f921bcba405d |
---|---|
28 cd foo-work | 28 cd foo-work |
29 hg pull -q | 29 hg pull -q |
30 hg merge | 30 hg merge |
31 | 31 |
32 echo % revert to changeset 1 to simulate a failed merge | 32 echo % revert to changeset 1 to simulate a failed merge |
33 rm -fr * | 33 rm -fr alpha beta gamma |
34 hg up -C 1 | 34 hg up -C 1 |