Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-issue619 @ 4815:8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Jul 2007 13:34:18 -0500 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
4798:452d171a1b39 | 4815:8808ea7da86b |
---|---|
1 #!/bin/sh | |
2 | |
3 mkdir t | |
4 cd t | |
5 hg init | |
6 echo a > a | |
7 hg ci -Ama -d '1000000000 0' | |
8 echo b > b | |
9 hg branch b | |
10 hg ci -Amb -d '1000000000 0' | |
11 hg co -C 0 | |
12 | |
13 echo fast-forward | |
14 hg merge b | |
15 hg ci -Ammerge -d '1000000000 0' | |
16 | |
17 echo bogus fast-forward should fail | |
18 hg merge b | |
19 | |
20 echo done |