| author | TK Soh <teekaysoh@yahoo.com> |
| Tue, 18 Oct 2005 20:06:05 -0700 | |
| changeset 1404 | 67e20e27d8df |
| parent 814 | 0902ffece4b4 |
| child 1933 | 7544700fd931 |
| permissions | -rwxr-xr-x |
|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 |
#!/bin/sh |
|
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
2 |
|
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
3 |
mkdir t |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
4 |
cd t |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
5 |
hg init |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
6 |
echo This is file a1 > a |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
7 |
echo This is file b1 > b |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
8 |
hg add a b |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
415
diff
changeset
|
9 |
hg commit -m "commit #0" -d "0 0" |
|
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
10 |
echo This is file b22 > b |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
415
diff
changeset
|
11 |
hg commit -m"comment #1" -d "0 0" |
|
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
12 |
hg update 0 |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
13 |
rm b |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
415
diff
changeset
|
14 |
hg commit -A -m"comment #2" -d "0 0" |
|
415
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
15 |
# in theory, we shouldn't need the "yes k" below, but it prevents |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
16 |
# this test from hanging when "hg update" erroneously prompts the |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
17 |
# user for "keep or delete" |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
18 |
yes k | hg update 1 |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
19 |
# we exit with 0 to avoid the unavoidable SIGPIPE from above causing |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
20 |
# us to fail this test |
|
c2b9502a4e96
[PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted
mpm@selenic.com
parents:
diff
changeset
|
21 |
exit 0 |