Mercurial > hg
view tests/test-merge5 @ 4044:78a0dd93db0b
Abort on empty username so specifying a username can be forced.
This behaviour was introduced by c3345b0f2fcd and broken by 98f2507c5551.
Added test for this.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 24 Jan 2007 23:04:51 +0100 |
parents | fffc8a733bf9 |
children | 6aa4a3fa4e60 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo This is file a1 > a echo This is file b1 > b hg add a b hg commit -m "commit #0" -d "1000000 0" echo This is file b22 > b hg commit -m"comment #1" -d "1000000 0" hg update 0 rm b hg commit -A -m"comment #2" -d "1000000 0" # in theory, we shouldn't need the "-y" below, but it prevents # this test from hanging when "hg update" erroneously prompts the # user for "keep or delete" hg update -y 1 exit 0