Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5 @ 1326:76b2c7096d08
Merge with MPM.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 23 Sep 2005 00:06:49 -0700 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
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 "0 0" echo This is file b22 > b hg commit -m"comment #1" -d "0 0" hg update 0 rm b hg commit -A -m"comment #2" -d "0 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