search

packit / dist-git-to-source-git

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

git cherry-pick error: could not apply 2c2d2ce... WALinuxAgent-2.2.49.2 base #135

Closed sentry-io[bot] closed 3 years ago

sentry-io[bot] commented 3 years ago

Sentry Issue: DIST2SRC-UPDATE-Y

GitCommandError: Cmd('git') failed due to: exit code(1)
  cmdline: git cherry-pick --keep-redundant-commits --strategy-option=theirs updates~2
  stderr: 'error: could not apply 2c2d2ce... WALinuxAgent-2.2.49.2 base
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit''
(5 additional frame(s) were not displayed)
...
  File "dist2src/core.py", line 430, in perform_convert
    from_branch=TEMP_SG_BRANCH, to_branch=dest_branch, theirs=update
  File "dist2src/core.py", line 168, in cherry_pick_base
    self.repo.git.cherry_pick(f"{from_branch}~{num_commits - 1}", **git_options)
  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)
TomasTomecek commented 3 years ago

seems like cherry-pick is unable to resolve some paths (despite user theirs)

this could resolve it:

https://github.com/packit/dist-git-to-source-git/pull/128/files#diff-08520d38af02d6ec9a67f9084bd12cc848c84391d063f85a7f97b5c4927f1513R176

csomh commented 3 years ago

I see this package is up to date already, so I assume this was fixed. :rocket: