Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5 @ 463:ea93402b81b9
Added stdint.h include to fix build on Mac OS X Tiger [v10.4]
author | kyle@zeus.moffetthome.net |
---|---|
date | Fri, 24 Jun 2005 20:53:51 -0500 |
parents | c2b9502a4e96 |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh -x mkdir t cd t hg init echo This is file a1 > a echo This is file b1 > b hg add a b hg commit -t "commit #0" -d "0 0" -u user echo This is file b22 > b hg commit -t"comment #1" -d "0 0" -u user hg update 0 rm b hg commit -A -t"comment #2" -d "0 0" -u user # in theory, we shouldn't need the "yes k" below, but it prevents # this test from hanging when "hg update" erroneously prompts the # user for "keep or delete" yes k | hg update 1 # we exit with 0 to avoid the unavoidable SIGPIPE from above causing # us to fail this test exit 0