Mercurial > hg
view tests/test-merge5 @ 8012:8c5f1b28e0bb
tests: use unified diff in test-command-template for better error reports
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 06 Apr 2009 10:53:01 +0200 |
parents | 6aa4a3fa4e60 |
children |
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" mv a c # 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" echo % should abort hg update -y 1 mv c a echo % should succeed hg update -y 1 exit 0