From 3c9b783cdbfbcfc31b6d041c0aa000bb338e9156 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@lilypond.org>
Date: Mon, 12 Feb 2007 20:03:40 +0100
Subject: [PATCH] new test for conflicts.

---
 tests/test-longconflict/_darcs/inventory           |  14 ++++++
 ...48b-b8684693fbc7370e48ab55d02a1afa62d0085228.gz | Bin 0 -> 90 bytes
 ...48b-c5c72873a1ed94dcdba7242e68e96189c5e2df27.gz | Bin 0 -> 82 bytes
 ...48b-e66e1a07cef6e836fc78de3d813c2e61c0d0f057.gz | Bin 0 -> 110 bytes
 ...48b-3acd307370805435c06b51e3ff4e49d082c8d8a4.gz | Bin 0 -> 85 bytes
 ...48b-9e4ec8cdeb6db98092e411a47d35a381c98043be.gz | Bin 0 -> 123 bytes
 ...48b-c6a86512a238cee5983ad5b8b51285e78b0ca3bb.gz | Bin 0 -> 82 bytes
 ...48b-575f6f86173f8bf5fbbe69465be4b4aa076343db.gz | Bin 0 -> 92 bytes
 tests/test-longconflict/_darcs/prefs/binaries      |  55 +++++++++++++++++++++
 tests/test-longconflict/_darcs/prefs/boring        |  35 +++++++++++++
 tests/test-longconflict/_darcs/prefs/defaultrepo   |   1 +
 tests/test-longconflict/_darcs/prefs/motd          |   0
 tests/test-longconflict/_darcs/prefs/repos         |   1 +
 tests/test-longconflict/_darcs/pristine/a          |   7 +++
 tests/test-longconflict/a                          |   7 +++
 15 files changed, 120 insertions(+)
 create mode 100644 tests/test-longconflict/_darcs/inventory
 create mode 100644 tests/test-longconflict/_darcs/patches/20070212172824-bf48b-b8684693fbc7370e48ab55d02a1afa62d0085228.gz
 create mode 100644 tests/test-longconflict/_darcs/patches/20070212172833-bf48b-c5c72873a1ed94dcdba7242e68e96189c5e2df27.gz
 create mode 100644 tests/test-longconflict/_darcs/patches/20070212172906-bf48b-e66e1a07cef6e836fc78de3d813c2e61c0d0f057.gz
 create mode 100644 tests/test-longconflict/_darcs/patches/20070212172929-bf48b-3acd307370805435c06b51e3ff4e49d082c8d8a4.gz
 create mode 100644 tests/test-longconflict/_darcs/patches/20070212172948-bf48b-9e4ec8cdeb6db98092e411a47d35a381c98043be.gz
 create mode 100644 tests/test-longconflict/_darcs/patches/20070212172953-bf48b-c6a86512a238cee5983ad5b8b51285e78b0ca3bb.gz
 create mode 100644 tests/test-longconflict/_darcs/patches/20070212173024-bf48b-575f6f86173f8bf5fbbe69465be4b4aa076343db.gz
 create mode 100644 tests/test-longconflict/_darcs/prefs/binaries
 create mode 100644 tests/test-longconflict/_darcs/prefs/boring
 create mode 100644 tests/test-longconflict/_darcs/prefs/defaultrepo
 create mode 100644 tests/test-longconflict/_darcs/prefs/motd
 create mode 100644 tests/test-longconflict/_darcs/prefs/repos
 create mode 100644 tests/test-longconflict/_darcs/pristine/a
 create mode 100644 tests/test-longconflict/a

diff --git a/tests/test-longconflict/_darcs/inventory b/tests/test-longconflict/_darcs/inventory
new file mode 100644
index 0000000..7e3d363
--- /dev/null
+++ b/tests/test-longconflict/_darcs/inventory
@@ -0,0 +1,14 @@
+[bla
+hanwen@lilypond.org**20070212172824] 
+[bla
+hanwen@lilypond.org**20070212172833] 
+[bla
+hanwen@lilypond.org**20070212172929] 
+[bla
+hanwen@lilypond.org**20070212172953] 
+[bla
+hanwen@lilypond.org**20070212172906] 
+[bbla
+hanwen@lilypond.org**20070212172948] 
+[resolve
+hanwen@lilypond.org**20070212173024] 
\ No newline at end of file
diff --git a/tests/test-longconflict/_darcs/patches/20070212172824-bf48b-b8684693fbc7370e48ab55d02a1afa62d0085228.gz b/tests/test-longconflict/_darcs/patches/20070212172824-bf48b-b8684693fbc7370e48ab55d02a1afa62d0085228.gz
new file mode 100644
index 0000000000000000000000000000000000000000..a6793bde7a874a1056d4a53bc3b958a7451882c6
GIT binary patch
literal 90
zcwUq5=3oE==5D`Jo=;ABoYD3_TYTc=nUy*x&U;@xt?zaHl97>tfw_T^iIIu<CIh3+
s&=t?Td^|l*pYaU6aG5<z^XzFhLlK^xTZ}&$@66iCkd<it+Y4wQ08z^%6951J

literal 0
HcwPel00001

diff --git a/tests/test-longconflict/_darcs/patches/20070212172833-bf48b-c5c72873a1ed94dcdba7242e68e96189c5e2df27.gz b/tests/test-longconflict/_darcs/patches/20070212172833-bf48b-c5c72873a1ed94dcdba7242e68e96189c5e2df27.gz
new file mode 100644
index 0000000000000000000000000000000000000000..997d57e7bbd12456a05e7d48ccd3383c8e9d6940
GIT binary patch
literal 82
zcwUq5=3oE==5D`Jo=;ABoYD3_TYTc=nUy*x&U;@xt?zaHl97>tfw_T^iIIu<CIhp+
k&=t>4X`DSBcHy#rh{2Of=T4k|vg#=lgX~xBzji=_0CjjI1poj5

literal 0
HcwPel00001

diff --git a/tests/test-longconflict/_darcs/patches/20070212172906-bf48b-e66e1a07cef6e836fc78de3d813c2e61c0d0f057.gz b/tests/test-longconflict/_darcs/patches/20070212172906-bf48b-e66e1a07cef6e836fc78de3d813c2e61c0d0f057.gz
new file mode 100644
index 0000000000000000000000000000000000000000..691eb3bbcca01edcbcbc16ba051ea98ae755e78b
GIT binary patch
literal 110
zcwUq5=3oE==5D`Jo=;ABoYD3_TYTc=nUy*x&U;@xt?zaHl97>tfw_T^iIIu<CKH41
z&=t>4`RaQ4>joKIFb=rz;FQMM(_t4b`-d1jymZdv%n`**o+)R}x2$jw^f~q963d||
NJ%;e48%d2oO91l7FR%ar

literal 0
HcwPel00001

diff --git a/tests/test-longconflict/_darcs/patches/20070212172929-bf48b-3acd307370805435c06b51e3ff4e49d082c8d8a4.gz b/tests/test-longconflict/_darcs/patches/20070212172929-bf48b-3acd307370805435c06b51e3ff4e49d082c8d8a4.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c4771227255b8fd7d07dc1633309b34299e122df
GIT binary patch
literal 85
zcwUq5=3oE==5D`Jo=;ABoYD3_TYTc=nUy*x&U;@xt?zaHl97>tfw_T^iIIu<CX-D)
np(~!9(l~oM?80UL5QArz&Yd{VBGfrEW@`+?q4eER&OoyO==>zU

literal 0
HcwPel00001

diff --git a/tests/test-longconflict/_darcs/patches/20070212172948-bf48b-9e4ec8cdeb6db98092e411a47d35a381c98043be.gz b/tests/test-longconflict/_darcs/patches/20070212172948-bf48b-9e4ec8cdeb6db98092e411a47d35a381c98043be.gz
new file mode 100644
index 0000000000000000000000000000000000000000..43cf2df3116a440d0d842f40353cb18bdb5bc7cc
GIT binary patch
literal 123
zcwUq5=3oE==59Z)Q=U&wd7RPqKU;j_<e8N^C(e6cJgx6_{gRQ9fq}V!k%^Is`6iQ%
z9ic0po$}T7^4ASAxL_P`;lSaO8fQ<3UAXKYV({$JxfADEggR%gX!4vHGmAq|xP!|#
bsn_S!k-SzlF>jNdSvwiFUrzCR0<;kTf*CZ%

literal 0
HcwPel00001

diff --git a/tests/test-longconflict/_darcs/patches/20070212172953-bf48b-c6a86512a238cee5983ad5b8b51285e78b0ca3bb.gz b/tests/test-longconflict/_darcs/patches/20070212172953-bf48b-c6a86512a238cee5983ad5b8b51285e78b0ca3bb.gz
new file mode 100644
index 0000000000000000000000000000000000000000..d470e58620c24b373833254fe76a069200ca8904
GIT binary patch
literal 82
zcwUq5=3oE==5D`Jo=;ABoYD3_TYTc=nUy*x&U;@xt?zaHl97>tfw_T^iIIu<CKJ=X
k&=t>4X`DSBcHy#rh{3~4=RD3lS@o2OA@_`xtR2uG0Bc$z*Z=?k

literal 0
HcwPel00001

diff --git a/tests/test-longconflict/_darcs/patches/20070212173024-bf48b-575f6f86173f8bf5fbbe69465be4b4aa076343db.gz b/tests/test-longconflict/_darcs/patches/20070212173024-bf48b-575f6f86173f8bf5fbbe69465be4b4aa076343db.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2d3b91ca733e3b5089a3c31376d96d890d93f6ac
GIT binary patch
literal 92
zcwUq5=3oE==59SN-E-$Py`P@)IHT=<w)n)!Gb?pYocF$XTHovXB_ksP19Jl-6C)FI
uGXtZ}&=t>4X`DSBcHy#rh{3Z<=R8ie2>w)167;%K#K;iOD<T;NG!g)eA0x*A

literal 0
HcwPel00001

diff --git a/tests/test-longconflict/_darcs/prefs/binaries b/tests/test-longconflict/_darcs/prefs/binaries
new file mode 100644
index 0000000..1ec9654
--- /dev/null
+++ b/tests/test-longconflict/_darcs/prefs/binaries
@@ -0,0 +1,55 @@
+# Binary file regexps:
+\.png$
+\.PNG$
+\.gz$
+\.GZ$
+\.pdf$
+\.PDF$
+\.jpg$
+\.JPG$
+\.jpeg$
+\.JPEG$
+\.gif$
+\.GIF$
+\.tif$
+\.TIF$
+\.tiff$
+\.TIFF$
+\.pnm$
+\.PNM$
+\.pbm$
+\.PBM$
+\.pgm$
+\.PGM$
+\.ppm$
+\.PPM$
+\.bmp$
+\.BMP$
+\.mng$
+\.MNG$
+\.tar$
+\.TAR$
+\.bz2$
+\.BZ2$
+\.z$
+\.Z$
+\.zip$
+\.ZIP$
+\.jar$
+\.JAR$
+\.so$
+\.SO$
+\.a$
+\.A$
+\.tgz$
+\.TGZ$
+\.mpg$
+\.MPG$
+\.mpeg$
+\.MPEG$
+\.iso$
+\.ISO$
+\.exe$
+\.EXE$
+\.doc$
+\.DOC$
diff --git a/tests/test-longconflict/_darcs/prefs/boring b/tests/test-longconflict/_darcs/prefs/boring
new file mode 100644
index 0000000..9a448f8
--- /dev/null
+++ b/tests/test-longconflict/_darcs/prefs/boring
@@ -0,0 +1,35 @@
+# Boring file regexps:
+\.hi$
+\.o$
+\.o\.cmd$
+# *.ko files aren't boring by default because they might
+# be Korean translations rather than kernel modules.
+# \.ko$
+\.ko\.cmd$
+\.mod\.c$
+(^|/)\.tmp_versions($|/)
+(^|/)CVS($|/)
+(^|/)RCS($|/)
+~$
+#(^|/)\.[^/]
+(^|/)_darcs($|/)
+\.bak$
+\.BAK$
+\.orig$
+(^|/)vssver\.scc$
+\.swp$
+(^|/)MT($|/)
+(^|/)\{arch\}($|/)
+(^|/).arch-ids($|/)
+(^|/),
+\.class$
+\.prof$
+(^|/)\.DS_Store$
+(^|/)BitKeeper($|/)
+(^|/)ChangeSet($|/)
+(^|/)\.svn($|/)
+\.py[co]$
+\#
+\.cvsignore$
+(^|/)Thumbs\.db$
+(^|/)autom4te\.cache($|/)
diff --git a/tests/test-longconflict/_darcs/prefs/defaultrepo b/tests/test-longconflict/_darcs/prefs/defaultrepo
new file mode 100644
index 0000000..bfd3b83
--- /dev/null
+++ b/tests/test-longconflict/_darcs/prefs/defaultrepo
@@ -0,0 +1 @@
+/tmp/y/a
diff --git a/tests/test-longconflict/_darcs/prefs/motd b/tests/test-longconflict/_darcs/prefs/motd
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test-longconflict/_darcs/prefs/repos b/tests/test-longconflict/_darcs/prefs/repos
new file mode 100644
index 0000000..bfd3b83
--- /dev/null
+++ b/tests/test-longconflict/_darcs/prefs/repos
@@ -0,0 +1 @@
+/tmp/y/a
diff --git a/tests/test-longconflict/_darcs/pristine/a b/tests/test-longconflict/_darcs/pristine/a
new file mode 100644
index 0000000..57391c1
--- /dev/null
+++ b/tests/test-longconflict/_darcs/pristine/a
@@ -0,0 +1,7 @@
+hoi
+hoi
+hbi
+hbi
+hoi
+hai
+hai
diff --git a/tests/test-longconflict/a b/tests/test-longconflict/a
new file mode 100644
index 0000000..57391c1
--- /dev/null
+++ b/tests/test-longconflict/a
@@ -0,0 +1,7 @@
+hoi
+hoi
+hbi
+hbi
+hoi
+hai
+hai
-- 
2.11.4.GIT