Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-issue433 @ 4603:66ed92ed115a
Make fast-forward merges full merges
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 18 Jun 2007 12:38:54 -0700 |
parents | 199dcb97a5b6 |
children | 7a7d4937272b |
rev | line source |
---|---|
3719
199dcb97a5b6
add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
1 #!/bin/sh |
199dcb97a5b6
add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
2 # http://www.selenic.com/mercurial/bts/issue433 |
199dcb97a5b6
add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
3 |
199dcb97a5b6
add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
4 hg init a |
199dcb97a5b6
add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
5 cd a |
199dcb97a5b6
add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
6 echo a > a |
199dcb97a5b6
add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
7 hg commit -Ama |
199dcb97a5b6
add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
8 |
199dcb97a5b6
add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
9 hg parents -r 0 doesnotexist |
199dcb97a5b6
add test for issue433
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
10 true |