Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict @ 5331:8ee5b8129e7b
hgweb: don't raise an exception when displying empty repos
The nullid node claims it's in the default branch, but the branch dict
is empty. This fixes the main symptom from issue696, but we may want
to set branchtags()['default'] = nullid somewhere for empty repos.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Mon, 24 Sep 2007 19:00:11 -0300 |
| parents | 93a4e72b4f83 |
| children |
| rev | line source |
|---|---|
|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
392
diff
changeset
|
1 #!/bin/sh |
| 346 | 2 |
| 3 hg init | |
| 4 echo "nothing" > a | |
| 5 hg add a | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1925
diff
changeset
|
6 hg commit -m ancestor -d "1000000 0" |
| 346 | 7 echo "something" > a |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1925
diff
changeset
|
8 hg commit -m branch1 -d "1000000 0" |
| 346 | 9 hg co 0 |
| 10 echo "something else" > a | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1925
diff
changeset
|
11 hg commit -m branch2 -d "1000000 0" |
|
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
12 hg merge 1 |
| 346 | 13 hg id |
|
4385
93a4e72b4f83
run-tests.py: pass -L/--label to simplemerge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4361
diff
changeset
|
14 cat a |
| 346 | 15 hg status |