diff options
Diffstat (limited to 'tests/revertfile_fixtures/osctest/simple/.osc')
15 files changed, 0 insertions, 29 deletions
diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_apiurl b/tests/revertfile_fixtures/osctest/simple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_files b/tests/revertfile_fixtures/osctest/simple/.osc/_files deleted file mode 100644 index 5dbd576..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_files +++ /dev/null @@ -1,10 +0,0 @@ -<directory name="conflict" rev="2" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="2"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> - <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> - <entry md5="eb9c2bf0eb63f3a7bc0ea37ef18aeba5" mtime="1282730880" name="somefile" size="13" /> - <entry md5="81be947db54c2e225dc8eacce64d8a4a" mtime="1282731457" name="replaced" size="17" /> - <entry md5="676513fde5797c3785164942c97dfec1" mtime="1282731738" name="missing" size="8" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="deleted" size="9" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="12" skipped="true" /> -</directory> diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_in_conflict b/tests/revertfile_fixtures/osctest/simple/.osc/_in_conflict deleted file mode 100644 index 257cc56..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_osclib_version b/tests/revertfile_fixtures/osctest/simple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_package b/tests/revertfile_fixtures/osctest/simple/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_project b/tests/revertfile_fixtures/osctest/simple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_added b/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_added deleted file mode 100644 index 1f4923c..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_added +++ /dev/null @@ -1,3 +0,0 @@ -toadd1 -replaced -addedmissing diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_deleted b/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_deleted deleted file mode 100644 index 08f95e5..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/_to_be_deleted +++ /dev/null @@ -1,2 +0,0 @@ -somefile -deleted diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/deleted b/tests/revertfile_fixtures/osctest/simple/.osc/deleted deleted file mode 100644 index e69de29..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/deleted +++ /dev/null diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/foo b/tests/revertfile_fixtures/osctest/simple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/merge b/tests/revertfile_fixtures/osctest/simple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/missing b/tests/revertfile_fixtures/osctest/simple/.osc/missing deleted file mode 100644 index 33e45d5..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/missing +++ /dev/null @@ -1 +0,0 @@ -missing diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/nochange b/tests/revertfile_fixtures/osctest/simple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/replaced b/tests/revertfile_fixtures/osctest/simple/.osc/replaced deleted file mode 100644 index 7c3f1a8..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/replaced +++ /dev/null @@ -1 +0,0 @@ -yet another file diff --git a/tests/revertfile_fixtures/osctest/simple/.osc/somefile b/tests/revertfile_fixtures/osctest/simple/.osc/somefile deleted file mode 100644 index 2ef267e..0000000 --- a/tests/revertfile_fixtures/osctest/simple/.osc/somefile +++ /dev/null @@ -1 +0,0 @@ -some content |