Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge5.out @ 767:61ed30e82b27
Update tests to match new addremove chattiness.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 22 Jul 2005 19:46:02 -0800 |
parents | 7e4843b7efd2 |
children | 1f9ec150a476 8f5637f0a0c0 0902ffece4b4 |
comparison
equal
deleted
inserted
replaced
766:b444a7e053f1 | 767:61ed30e82b27 |
---|---|
8 + echo This is file b22 | 8 + echo This is file b22 |
9 + hg commit '-mcomment #1' -d '0 0' | 9 + hg commit '-mcomment #1' -d '0 0' |
10 + hg update 0 | 10 + hg update 0 |
11 + rm b | 11 + rm b |
12 + hg commit -A '-mcomment #2' -d '0 0' | 12 + hg commit -A '-mcomment #2' -d '0 0' |
13 removing b | |
13 + yes k | 14 + yes k |
14 + hg update 1 | 15 + hg update 1 |
15 this update spans a branch affecting the following files: | 16 this update spans a branch affecting the following files: |
16 b | 17 b |
17 aborting update spanning branches! | 18 aborting update spanning branches! |