search

packit / dist-git-to-source-git

Converting dist-git to source-git
MIT License
4 stars 9 forks source link

Failing to update mvapich2:c8s #157

Closed sentry-io[bot] closed 3 years ago

sentry-io[bot] commented 3 years ago

Sentry Issue: DIST2SRC-UPDATE-1H

GitCommandError: Cmd('git') failed due to: exit code(1)
  cmdline: git cherry-pick --allow-empty --keep-redundant-commits --strategy-option=theirs 80388bd0 73d5dac0 35c4ce70
  stdout: '[imports/c8s/mvapich2-2.3.5-1.el8 141b2b4b] Apply patch 0001-mvapich23-unbundle-contrib-hwloc.patch
 Date: Mon Jan 4 09:58:38 2021 +0000
 1 file changed, 6 insertions(+), 6 deletions(-)
[imports/c8s/mvapich2-2.3.5-1.el8 adcdad48] Apply patch 0002-mvapich23-unbundle-osu_benchmarks.patch
 Date: Mon Jan 4 09:58:39 2021 +0000
 1 file changed, ...
(5 additional frame(s) were not displayed)
...
  File "dist2src/core.py", line 482, in perform_convert
    self.rebase_patches(from_branch=TEMP_SG_BRANCH, to_branch=dest_branch)
  File "dist2src/core.py", line 679, in rebase_patches
    strategy_option="theirs",
  File "git/cmd.py", line 542, in <lambda>
    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
  File "git/cmd.py", line 1005, in _call_process
    return self.execute(call, **exec_kwargs)
  File "git/cmd.py", line 822, in execute
    raise GitCommandError(command, status, stderr_value, stdout_value)