Mercurial > hg
view tests/test-merge-default.out @ 7035:9d023ef7b467
forbid username with '\n' at the changelog level
It was already forbidden for ui.username() but no verification were
made for username passed through the commandline.
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 13 Sep 2008 17:46:09 +0200 |
parents | 4b0c9c674707 |
children | 1fe6f365df2e |
line wrap: on
line source
adding a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail because not at a head abort: repo has 3 heads - please merge with an explicit rev 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail because > 2 heads abort: repo has 3 heads - please merge with an explicit rev % should succeed 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % should succeed - 2 heads 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % should fail because at tip abort: there is nothing to merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % should fail because 1 head abort: there is nothing to merge - use "hg update" instead