diff options
Diffstat (limited to 'tests/commit_fixtures/osctest')
113 files changed, 0 insertions, 197 deletions
diff --git a/tests/commit_fixtures/osctest/.osc/_apiurl b/tests/commit_fixtures/osctest/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/.osc/_packages b/tests/commit_fixtures/osctest/.osc/_packages deleted file mode 100644 index 04e56f0..0000000 --- a/tests/commit_fixtures/osctest/.osc/_packages +++ /dev/null @@ -1 +0,0 @@ -<project name="osctest" /> diff --git a/tests/commit_fixtures/osctest/.osc/_project b/tests/commit_fixtures/osctest/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/commit_fixtures/osctest/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/commit_fixtures/osctest/add/.osc/_apiurl b/tests/commit_fixtures/osctest/add/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/add/.osc/_files b/tests/commit_fixtures/osctest/add/.osc/_files deleted file mode 100644 index 6c3d53a..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="add" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <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" /> -</directory> diff --git a/tests/commit_fixtures/osctest/add/.osc/_osclib_version b/tests/commit_fixtures/osctest/add/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/add/.osc/_package b/tests/commit_fixtures/osctest/add/.osc/_package deleted file mode 100644 index 76d4bb8..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -add diff --git a/tests/commit_fixtures/osctest/add/.osc/_project b/tests/commit_fixtures/osctest/add/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/add/.osc/_to_be_added b/tests/commit_fixtures/osctest/add/.osc/_to_be_added deleted file mode 100644 index 76d4bb8..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/_to_be_added +++ /dev/null @@ -1 +0,0 @@ -add diff --git a/tests/commit_fixtures/osctest/add/.osc/foo b/tests/commit_fixtures/osctest/add/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/add/.osc/merge b/tests/commit_fixtures/osctest/add/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/add/.osc/nochange b/tests/commit_fixtures/osctest/add/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/add/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/add/add b/tests/commit_fixtures/osctest/add/add deleted file mode 100644 index b242c36..0000000 --- a/tests/commit_fixtures/osctest/add/add +++ /dev/null @@ -1 +0,0 @@ -added file diff --git a/tests/commit_fixtures/osctest/add/exists b/tests/commit_fixtures/osctest/add/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/add/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/add/foo b/tests/commit_fixtures/osctest/add/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/add/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/add/merge b/tests/commit_fixtures/osctest/add/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/add/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/add/nochange b/tests/commit_fixtures/osctest/add/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/add/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_apiurl b/tests/commit_fixtures/osctest/added_missing/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_files b/tests/commit_fixtures/osctest/added_missing/.osc/_files deleted file mode 100644 index d474ef3..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_files +++ /dev/null @@ -1,3 +0,0 @@ -<directory name="added_missing" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" skipped="True" /> -</directory> diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_osclib_version b/tests/commit_fixtures/osctest/added_missing/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_package b/tests/commit_fixtures/osctest/added_missing/.osc/_package deleted file mode 100644 index db0af96..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -added_missing diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_project b/tests/commit_fixtures/osctest/added_missing/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/added_missing/.osc/_to_be_added b/tests/commit_fixtures/osctest/added_missing/.osc/_to_be_added deleted file mode 100644 index b03d55d..0000000 --- a/tests/commit_fixtures/osctest/added_missing/.osc/_to_be_added +++ /dev/null @@ -1,2 +0,0 @@ -add -bar diff --git a/tests/commit_fixtures/osctest/added_missing/bar b/tests/commit_fixtures/osctest/added_missing/bar deleted file mode 100644 index 323fae0..0000000 --- a/tests/commit_fixtures/osctest/added_missing/bar +++ /dev/null @@ -1 +0,0 @@ -foobar diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_apiurl b/tests/commit_fixtures/osctest/allstates/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_files b/tests/commit_fixtures/osctest/allstates/.osc/_files deleted file mode 100644 index 02a576b..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_files +++ /dev/null @@ -1,8 +0,0 @@ -<directory name="allstates" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> - <entry md5="676513fde5797c3785164942c97dfec1" mtime="1283506309" name="missing" size="8" /> - <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> - <entry md5="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> - <entry md5="ffffffffffffffffffffffffffffffff" mtime="1111111111" name="skipped" size="100" skipped="true" /> -</directory> diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_osclib_version b/tests/commit_fixtures/osctest/allstates/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_package b/tests/commit_fixtures/osctest/allstates/.osc/_package deleted file mode 100644 index 9d1ec82..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -allstates diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_project b/tests/commit_fixtures/osctest/allstates/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_to_be_added b/tests/commit_fixtures/osctest/allstates/.osc/_to_be_added deleted file mode 100644 index cd0a2fe..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_to_be_added +++ /dev/null @@ -1,2 +0,0 @@ -add -missing diff --git a/tests/commit_fixtures/osctest/allstates/.osc/_to_be_deleted b/tests/commit_fixtures/osctest/allstates/.osc/_to_be_deleted deleted file mode 100644 index 257cc56..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tests/commit_fixtures/osctest/allstates/.osc/foo b/tests/commit_fixtures/osctest/allstates/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/allstates/.osc/merge b/tests/commit_fixtures/osctest/allstates/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/allstates/.osc/missing b/tests/commit_fixtures/osctest/allstates/.osc/missing deleted file mode 100644 index 33e45d5..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/missing +++ /dev/null @@ -1 +0,0 @@ -missing diff --git a/tests/commit_fixtures/osctest/allstates/.osc/nochange b/tests/commit_fixtures/osctest/allstates/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/allstates/.osc/test b/tests/commit_fixtures/osctest/allstates/.osc/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/commit_fixtures/osctest/allstates/.osc/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/commit_fixtures/osctest/allstates/add b/tests/commit_fixtures/osctest/allstates/add deleted file mode 100644 index b242c36..0000000 --- a/tests/commit_fixtures/osctest/allstates/add +++ /dev/null @@ -1 +0,0 @@ -added file diff --git a/tests/commit_fixtures/osctest/allstates/exists b/tests/commit_fixtures/osctest/allstates/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/allstates/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/allstates/missing b/tests/commit_fixtures/osctest/allstates/missing deleted file mode 100644 index feae347..0000000 --- a/tests/commit_fixtures/osctest/allstates/missing +++ /dev/null @@ -1 +0,0 @@ -replaced diff --git a/tests/commit_fixtures/osctest/allstates/nochange b/tests/commit_fixtures/osctest/allstates/nochange deleted file mode 100644 index 34d6872..0000000 --- a/tests/commit_fixtures/osctest/allstates/nochange +++ /dev/null @@ -1 +0,0 @@ -This file did change. diff --git a/tests/commit_fixtures/osctest/allstates/test b/tests/commit_fixtures/osctest/allstates/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/commit_fixtures/osctest/allstates/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/commit_fixtures/osctest/branch/.osc/_apiurl b/tests/commit_fixtures/osctest/branch/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/branch/.osc/_files b/tests/commit_fixtures/osctest/branch/.osc/_files deleted file mode 100644 index 8cbc407..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="unix" rev="9afa23b484de05e28364b18de7bb1432" srcmd5="9afa23b484de05e28364b18de7bb1432"> - <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="cd21541fe2442d3d324a6d6103752913" package="unique" project="btest" srcmd5="b63634ab40861fdb8b44e5f4f459c621" /> - <entry md5="75d884cf1d235180faec5acb63063972" mtime="1283525196" name="simple" size="21" /> -</directory> diff --git a/tests/commit_fixtures/osctest/branch/.osc/_meta b/tests/commit_fixtures/osctest/branch/.osc/_meta deleted file mode 100644 index 2a9b220..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_meta +++ /dev/null @@ -1,5 +0,0 @@ -<package project="home:Admin" name="unix"> - <title/> - <description>This package was branched from btest in order to ...</description> - <person role="maintainer" userid="Admin"/> -</package> diff --git a/tests/commit_fixtures/osctest/branch/.osc/_osclib_version b/tests/commit_fixtures/osctest/branch/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/branch/.osc/_package b/tests/commit_fixtures/osctest/branch/.osc/_package deleted file mode 100644 index 80858c1..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -branch diff --git a/tests/commit_fixtures/osctest/branch/.osc/_project b/tests/commit_fixtures/osctest/branch/.osc/_project deleted file mode 100644 index b83ffd3..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest diff --git a/tests/commit_fixtures/osctest/branch/.osc/simple b/tests/commit_fixtures/osctest/branch/.osc/simple deleted file mode 100644 index f425d9a..0000000 --- a/tests/commit_fixtures/osctest/branch/.osc/simple +++ /dev/null @@ -1 +0,0 @@ -imple modified file. diff --git a/tests/commit_fixtures/osctest/branch/cfilesremote b/tests/commit_fixtures/osctest/branch/cfilesremote deleted file mode 100644 index 5fe6f29..0000000 --- a/tests/commit_fixtures/osctest/branch/cfilesremote +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="branch" rev="5" srcmd5="1d4bbfa2655ab3982074226e16e1e5ff" vrev="5"> - <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="1d4bbfa2655ab3982074226e16e1e5ff" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" xsrcmd5="87ea02aede261b0267aabaa97c756e7a" /> - <entry md5="542f96b49b64095104d8a9e9dd313a9c" mtime="1283521153" name="_link" size="130" /> - <entry md5="75da7f7167c22b2b02c6879366d78ad1" mtime="1283525027" name="simple" size="22" /> -</directory> diff --git a/tests/commit_fixtures/osctest/branch/files b/tests/commit_fixtures/osctest/branch/files deleted file mode 100644 index 1f37d41..0000000 --- a/tests/commit_fixtures/osctest/branch/files +++ /dev/null @@ -1,4 +0,0 @@ -<directory name="branch" rev="87ea02aede261b0267aabaa97c756e7a" srcmd5="87ea02aede261b0267aabaa97c756e7a"> - <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="1d4bbfa2655ab3982074226e16e1e5ff" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" /> - <entry md5="75da7f7167c22b2b02c6879366d78ad1" mtime="1283525027" name="simple" size="22" /> -</directory> diff --git a/tests/commit_fixtures/osctest/branch/filesremote b/tests/commit_fixtures/osctest/branch/filesremote deleted file mode 100644 index 1bfc91b..0000000 --- a/tests/commit_fixtures/osctest/branch/filesremote +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="branch" rev="6" srcmd5="cd21541fe2442d3d324a6d6103752913" vrev="6"> - <linkinfo baserev="b63634ab40861fdb8b44e5f4f459c621" lsrcmd5="cd21541fe2442d3d324a6d6103752913" package="bar" project="foo" srcmd5="b63634ab40861fdb8b44e5f4f459c621" xsrcmd5="9afa23b484de05e28364b18de7bb1432" /> - <entry md5="542f96b49b64095104d8a9e9dd313a9c" mtime="1283521153" name="_link" size="130" skipped="true" /> - <entry md5="75d884cf1d235180faec5acb63063972" mtime="1283525196" name="simple" size="21" /> -</directory> diff --git a/tests/commit_fixtures/osctest/branch/simple b/tests/commit_fixtures/osctest/branch/simple deleted file mode 100644 index 60627a5..0000000 --- a/tests/commit_fixtures/osctest/branch/simple +++ /dev/null @@ -1 +0,0 @@ -simple modified file. diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_apiurl b/tests/commit_fixtures/osctest/conflict/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_files b/tests/commit_fixtures/osctest/conflict/.osc/_files deleted file mode 100644 index a67ff42..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="conflict" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282130148" name="foo" size="23" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282130148" name="merge" size="48" /> - <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282130148" name="nochange" size="25" /> -</directory>
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_in_conflict b/tests/commit_fixtures/osctest/conflict/.osc/_in_conflict deleted file mode 100644 index a00af07..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_in_conflict +++ /dev/null @@ -1 +0,0 @@ -merge diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_osclib_version b/tests/commit_fixtures/osctest/conflict/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_package b/tests/commit_fixtures/osctest/conflict/.osc/_package deleted file mode 100644 index 783a0ef..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -conflict
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/conflict/.osc/_project b/tests/commit_fixtures/osctest/conflict/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/conflict/.osc/foo b/tests/commit_fixtures/osctest/conflict/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/conflict/.osc/merge b/tests/commit_fixtures/osctest/conflict/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/conflict/.osc/nochange b/tests/commit_fixtures/osctest/conflict/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/conflict/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/conflict/foo b/tests/commit_fixtures/osctest/conflict/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/conflict/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/conflict/merge b/tests/commit_fixtures/osctest/conflict/merge deleted file mode 100644 index f4ff164..0000000 --- a/tests/commit_fixtures/osctest/conflict/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it possible -to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/conflict/nochange b/tests/commit_fixtures/osctest/conflict/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/conflict/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/delete/.osc/_apiurl b/tests/commit_fixtures/osctest/delete/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/delete/.osc/_files b/tests/commit_fixtures/osctest/delete/.osc/_files deleted file mode 100644 index b8bf188..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="delete" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <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" /> -</directory> diff --git a/tests/commit_fixtures/osctest/delete/.osc/_osclib_version b/tests/commit_fixtures/osctest/delete/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/delete/.osc/_package b/tests/commit_fixtures/osctest/delete/.osc/_package deleted file mode 100644 index c8b1b42..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -delete diff --git a/tests/commit_fixtures/osctest/delete/.osc/_project b/tests/commit_fixtures/osctest/delete/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/delete/.osc/_to_be_deleted b/tests/commit_fixtures/osctest/delete/.osc/_to_be_deleted deleted file mode 100644 index 55aa746..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/_to_be_deleted +++ /dev/null @@ -1 +0,0 @@ -nochange diff --git a/tests/commit_fixtures/osctest/delete/.osc/foo b/tests/commit_fixtures/osctest/delete/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/delete/.osc/merge b/tests/commit_fixtures/osctest/delete/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/delete/.osc/nochange b/tests/commit_fixtures/osctest/delete/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/delete/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/delete/exists b/tests/commit_fixtures/osctest/delete/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/delete/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/delete/foo b/tests/commit_fixtures/osctest/delete/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/delete/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/delete/merge b/tests/commit_fixtures/osctest/delete/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/delete/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_apiurl b/tests/commit_fixtures/osctest/multiple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_files b/tests/commit_fixtures/osctest/multiple/.osc/_files deleted file mode 100644 index 9df02ca..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_files +++ /dev/null @@ -1,6 +0,0 @@ -<directory name="multiple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <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="d8e8fca2dc0f896fd7cb4cb0031ba249" mtime="1283505591" name="test" size="5" /> -</directory> diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_osclib_version b/tests/commit_fixtures/osctest/multiple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_package b/tests/commit_fixtures/osctest/multiple/.osc/_package deleted file mode 100644 index 5c4139d..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -multiple diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_project b/tests/commit_fixtures/osctest/multiple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_to_be_added b/tests/commit_fixtures/osctest/multiple/.osc/_to_be_added deleted file mode 100644 index 91e4e3d..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_to_be_added +++ /dev/null @@ -1,2 +0,0 @@ -add -add2 diff --git a/tests/commit_fixtures/osctest/multiple/.osc/_to_be_deleted b/tests/commit_fixtures/osctest/multiple/.osc/_to_be_deleted deleted file mode 100644 index cf978bc..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/_to_be_deleted +++ /dev/null @@ -1,2 +0,0 @@ -foo -merge diff --git a/tests/commit_fixtures/osctest/multiple/.osc/foo b/tests/commit_fixtures/osctest/multiple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/multiple/.osc/merge b/tests/commit_fixtures/osctest/multiple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/multiple/.osc/nochange b/tests/commit_fixtures/osctest/multiple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/multiple/.osc/test b/tests/commit_fixtures/osctest/multiple/.osc/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/commit_fixtures/osctest/multiple/.osc/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/commit_fixtures/osctest/multiple/add b/tests/commit_fixtures/osctest/multiple/add deleted file mode 100644 index b242c36..0000000 --- a/tests/commit_fixtures/osctest/multiple/add +++ /dev/null @@ -1 +0,0 @@ -added file diff --git a/tests/commit_fixtures/osctest/multiple/add2 b/tests/commit_fixtures/osctest/multiple/add2 deleted file mode 100644 index 4755903..0000000 --- a/tests/commit_fixtures/osctest/multiple/add2 +++ /dev/null @@ -1 +0,0 @@ -add2 diff --git a/tests/commit_fixtures/osctest/multiple/exists b/tests/commit_fixtures/osctest/multiple/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/multiple/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/multiple/nochange b/tests/commit_fixtures/osctest/multiple/nochange deleted file mode 100644 index 34d6872..0000000 --- a/tests/commit_fixtures/osctest/multiple/nochange +++ /dev/null @@ -1 +0,0 @@ -This file did change. diff --git a/tests/commit_fixtures/osctest/multiple/test b/tests/commit_fixtures/osctest/multiple/test deleted file mode 100644 index 9daeafb..0000000 --- a/tests/commit_fixtures/osctest/multiple/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/_apiurl b/tests/commit_fixtures/osctest/nochanges/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/_files b/tests/commit_fixtures/osctest/nochanges/.osc/_files deleted file mode 100644 index fee086c..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="nochanges" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <entry md5="0d62ceea6020d75154078a20d8c9f9ba" mtime="1282047302" name="foo" size="23" skipped="True" /> - <entry md5="17b9e9e1a032ed44e7a584dc6303ffa8" mtime="1282047303" name="merge" size="48" /> - <entry md5="7efa70f68983fad1cf487f69dedf93e9" mtime="1282047303" name="nochange" size="25" /> -</directory> diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/_osclib_version b/tests/commit_fixtures/osctest/nochanges/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/_package b/tests/commit_fixtures/osctest/nochanges/.osc/_package deleted file mode 100644 index 40b16a9..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -nochanges diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/_project b/tests/commit_fixtures/osctest/nochanges/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/merge b/tests/commit_fixtures/osctest/nochanges/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/nochanges/.osc/nochange b/tests/commit_fixtures/osctest/nochanges/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/nochanges/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/nochanges/exists b/tests/commit_fixtures/osctest/nochanges/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/nochanges/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/nochanges/nochange b/tests/commit_fixtures/osctest/nochanges/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/nochanges/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/simple/.osc/_apiurl b/tests/commit_fixtures/osctest/simple/.osc/_apiurl deleted file mode 100644 index 0afeace..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/_apiurl +++ /dev/null @@ -1 +0,0 @@ -http://localhost diff --git a/tests/commit_fixtures/osctest/simple/.osc/_files b/tests/commit_fixtures/osctest/simple/.osc/_files deleted file mode 100644 index d2e3da5..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/_files +++ /dev/null @@ -1,5 +0,0 @@ -<directory name="simple" rev="1" srcmd5="2df1eacfe03a3bec2112529e7f4dc39a" vrev="1"> - <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" /> -</directory> diff --git a/tests/commit_fixtures/osctest/simple/.osc/_osclib_version b/tests/commit_fixtures/osctest/simple/.osc/_osclib_version deleted file mode 100644 index d3827e7..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/_osclib_version +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/tests/commit_fixtures/osctest/simple/.osc/_package b/tests/commit_fixtures/osctest/simple/.osc/_package deleted file mode 100644 index 8fd3246..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/_package +++ /dev/null @@ -1 +0,0 @@ -simple
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/simple/.osc/_project b/tests/commit_fixtures/osctest/simple/.osc/_project deleted file mode 100644 index cea3bc8..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/_project +++ /dev/null @@ -1 +0,0 @@ -osctest
\ No newline at end of file diff --git a/tests/commit_fixtures/osctest/simple/.osc/foo b/tests/commit_fixtures/osctest/simple/.osc/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/simple/.osc/merge b/tests/commit_fixtures/osctest/simple/.osc/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_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/commit_fixtures/osctest/simple/.osc/nochange b/tests/commit_fixtures/osctest/simple/.osc/nochange deleted file mode 100644 index 0569b03..0000000 --- a/tests/commit_fixtures/osctest/simple/.osc/nochange +++ /dev/null @@ -1 +0,0 @@ -This file didn't change. diff --git a/tests/commit_fixtures/osctest/simple/exists b/tests/commit_fixtures/osctest/simple/exists deleted file mode 100644 index e69de29..0000000 --- a/tests/commit_fixtures/osctest/simple/exists +++ /dev/null diff --git a/tests/commit_fixtures/osctest/simple/foo b/tests/commit_fixtures/osctest/simple/foo deleted file mode 100644 index 3bb34cf..0000000 --- a/tests/commit_fixtures/osctest/simple/foo +++ /dev/null @@ -1 +0,0 @@ -This is a simple test. diff --git a/tests/commit_fixtures/osctest/simple/merge b/tests/commit_fixtures/osctest/simple/merge deleted file mode 100644 index 0b4685d..0000000 --- a/tests/commit_fixtures/osctest/simple/merge +++ /dev/null @@ -1,4 +0,0 @@ -Is it -possible to -merge this file? -I hope so... diff --git a/tests/commit_fixtures/osctest/simple/nochange b/tests/commit_fixtures/osctest/simple/nochange deleted file mode 100644 index 3a48a29..0000000 --- a/tests/commit_fixtures/osctest/simple/nochange +++ /dev/null @@ -1,2 +0,0 @@ -This file didn't change but -is modified. |