Mercurial > hg
view tests/test-merge5 @ 6113:8ca25589e960
try to fix test-inherit-mode on HFS+
HFS+ doesn't like setgid directories, so avoid them in most
of the test and do a quick check that doesn't change the
output when everything's OK.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Fri, 15 Feb 2008 10:51:35 -0200 |
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