Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge6 @ 2076:d007df6daf8e
Create an atomic opener that does not automatically rename on close
The revlog.checkinlinesize() uses an atomic opener to replace the
index file after converting it from inline to traditional .i and .d
files. If this operation is interrupted, the atomic file class can
overwrite a valid file with a partially written one.
This patch introduces an atomic opener that does not automatically
replace the destination file with the tempfile. This way
an interrupted checkinlinesize() call turns into a noop.
author | mason@suse.com |
---|---|
date | Tue, 04 Apr 2006 16:38:44 -0400 |
parents | 7544700fd931 |
children | e506c14382fd |
rev | line source |
---|---|
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 |
616 | 2 |
3 cat <<'EOF' > merge | |
4 #!/bin/sh | |
5 echo merging for `basename $1` | |
6 EOF | |
7 chmod +x merge | |
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
|
8 HGMERGE=./merge; export HGMERGE |
616 | 9 |
10 mkdir A1 | |
11 cd A1 | |
12 hg init | |
13 echo This is file foo1 > foo | |
14 echo This is file bar1 > bar | |
15 hg add foo bar | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
16 hg commit -m "commit text" -d "1000000 0" |
616 | 17 |
18 cd .. | |
19 hg clone A1 B1 | |
20 | |
21 cd A1 | |
22 rm bar | |
23 hg remove bar | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
24 hg commit -m "commit test" -d "1000000 0" |
616 | 25 |
26 cd ../B1 | |
27 echo This is file foo22 > foo | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
28 hg commit -m "commit test" -d "1000000 0" |
616 | 29 |
30 cd .. | |
31 hg clone A1 A2 | |
32 hg clone B1 B2 | |
33 | |
34 cd A1 | |
35 hg pull ../B1 | |
36 hg update -m | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
37 hg commit -m "commit test" -d "1000000 0" |
616 | 38 echo bar should remain deleted. |
39 hg manifest | |
40 | |
41 cd ../B2 | |
42 hg pull ../A2 | |
43 hg update -m | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
44 hg commit -m "commit test" -d "1000000 0" |
616 | 45 echo bar should remain deleted. |
46 hg manifest |