Mercurial > hg
view tests/test-merge5 @ 1953:379ab45b91b7
change default strftime format for better portability
On some systems, such as Solaris and HP-UX, "%c" format
give output without the leading zero on the single-digit
month-day.
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Tue, 14 Mar 2006 22:01:30 -0800 |
parents | 7544700fd931 |
children | 39eb64b23cb5 |
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 "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