github.com_openSUSE_osc/merge at a3c2aeb64c1acf69eafad92966df2d3699671541 - github.com_openSUSE_osc - openSUSE Gitea

mirrors/github.com_openSUSE_osc

mirror of https://github.com/openSUSE/osc.git synced 2024-11-10 22:56:15 +01:00

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

5 lines

48 B

Plaintext

Raw Blame History

 Is it
 possible to
 merge this file?
 I hope so...