1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-09-21 17:56:19 +02:00
github.com_openSUSE_osc/tests/deletefile_fixtures/osctest/conflict
Marcus Huewe 88a961cae4 - rewrote addfile() and delete_file() methods from the Package class (for the details see below)
- addfile():
  * contains the complete logic for adding a file (=> simplified addFiles(...))
  * semantic fixes
- delete_file():
  * semantic fixes
- different handling of newly added/replaced files:
  * added/replaced files are tracked in the .osc/_to_be_added file
- introduced new file state 'R': 'R' == "replaced"
  * usecase: osc rm <file>; osc add <file> => new state is 'R'
  * conceptually 'R' is equal to 'A'
- adapted revert() to support the new state (+ some other minor fixes)
- added testcases for addfile() and delete_file()
2010-08-31 13:30:36 +02:00
..
.osc - rewrote addfile() and delete_file() methods from the Package class (for the details see below) 2010-08-31 13:30:36 +02:00
foo - rewrote addfile() and delete_file() methods from the Package class (for the details see below) 2010-08-31 13:30:36 +02:00
foo.mine - rewrote addfile() and delete_file() methods from the Package class (for the details see below) 2010-08-31 13:30:36 +02:00
foo.r2 - rewrote addfile() and delete_file() methods from the Package class (for the details see below) 2010-08-31 13:30:36 +02:00
merge - rewrote addfile() and delete_file() methods from the Package class (for the details see below) 2010-08-31 13:30:36 +02:00
nochange - rewrote addfile() and delete_file() methods from the Package class (for the details see below) 2010-08-31 13:30:36 +02:00
toadd1 - rewrote addfile() and delete_file() methods from the Package class (for the details see below) 2010-08-31 13:30:36 +02:00
toadd2 - rewrote addfile() and delete_file() methods from the Package class (for the details see below) 2010-08-31 13:30:36 +02:00