mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-11-11 07:06:16 +01:00
Code
a3c2aeb64c
github.com_openSUSE_osc/tests/deletefile_fixtures/osctest/conflict/merge

5 lines
48 B
Plaintext
Raw Normal View History

- 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-24 18:06:47 +02:00
Is it
possible to
merge this file?
I hope so...
Copy Permalink