Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-copy-move-merge.out @ 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 | 8d9bdcbb2b18 |
| children | 17ed9b9a0d03 |
line wrap: on
line source
1 files updated, 0 files merged, 2 files removed, 0 files unresolved resolving manifests overwrite None partial False ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0 a: remote moved to c -> m a: remote moved to b -> m copying a to b copying a to c merging a and b my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 removing a merging a and c my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 0 files updated, 2 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) -- b -- 0 1 2 -- c -- 0 1 2