Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • P Pacman Contrib
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Graph
    • Compare
    • Locked Files
  • Issues 11
    • Issues 11
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Deployments
    • Deployments
    • Releases
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Pacman
  • Pacman Contrib
  • Merge requests
  • !15
The source project of this merge request has been removed.

Small but important fixes for pacdiff's merge action

Merged Evangelos Foutras requested to merge (removed):pacdiff-merge-fixes into master Jun 04, 2022
  • Overview 0
  • Pipelines 0
  • Changes 1

The main fix here is correcting how pacdiff filters and sorts the candidate base packages (switched to descending order and started ignoring signature files). The smaller fix in the other commit is to abort if extraction of the original file fails for whatever reason (which would lead to the current file being duplicated due to the empty merge base).

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: pacdiff-merge-fixes