Branch: refs/heads/master Home: https://github.com/openSUSE/osc Commit: bf42c70f56989009fbc0e6c988803c903ef7ab6d https://github.com/openSUSE/osc/commit/bf42c70f56989009fbc0e6c988803c903ef7a... Author: Marcus Huewe Date: 2021-07-20 (Tue, 20 Jul 2021) Changed paths: M osc/core.py Log Message: ----------- Use a fixed suffix for the upfilename in Package.mergefile The old code uses a variable .rXYZ suffix (where XYZ is the revision of the package wc during the merge operation). Now, if Package.mergefile is invoked during an update, XYZ represents the "old" revision. That is, if a merge conflict happens, then a subsequent "osc resolved <file>" will not unlink the <file>.rXYZ file (because Package.clear_from_conflictlist only takes the current rev into account). In order to fix this, use a fixed ".new" suffix. This way, Package.clear_from_conflictlist can properly unlink the corresponding *.new file. This naming scheme for the "upfilename" is in line with "osc pull" and "osc repairlink". Note: if a working copy was updated with an "old" osc version (without this commit) and a "new" osc version (with this commit) is used to run "osc resolved <file>", then the <file>.rXYZ file is _NOT_ removed (it is not worth the effort to add compat code for this). Commit: e5dda8337cdbaaedec8f542967d7f059c8d70580 https://github.com/openSUSE/osc/commit/e5dda8337cdbaaedec8f542967d7f059c8d70... Author: Marcus Huewe Date: 2021-07-27 (Tue, 27 Jul 2021) Changed paths: M osc/core.py Log Message: ----------- Merge branch 'mergefile_fixed_suffix' of https://github.com/marcus-h/osc Use a fixed suffix for the upfilename in Package.mergefile. Compare: https://github.com/openSUSE/osc/compare/3883ea4bcb12...e5dda8337cdb