CA124008, HFX-1226: Report out-of-space, not patch-invalid #1821

Closed
wants to merge 1 commit into
from

Conversation

Projects
None yet
3 participants
@kaifengz

kaifengz commented Jul 9, 2014

Merge pull request #1678 from thomassa/ca124008-patch-upload-enospc
Report out-of-space, not patch-invalid(cherry picked from commit 4d40bcb)

Merge pull request #1678 from thomassa/ca124008-patch-upload-enospc
Report out-of-space, not patch-invalid(cherry picked from commit 4d40bcb)
@thomassa

This comment has been minimized.

Show comment Hide comment
@thomassa

thomassa Jul 9, 2014

Member

Thank you for re-doing pullreq #1820 here, but this still isn't quite what we want. You have cherry-picked the commit that merged #1678 into the master branch, rather than cherry-picking the set of seven commits that are contained in #1678.

As I wrote on #1820,

Normally we do this sort of thing by using the git cherry-pick -x command on the set of commits that made up the original pull-request. That way we also get the history and original commit-messages.

You might find Jerome's pull-request duplicator tool useful:
https://github.com/xenserver/PRDup
https://github.com/jeromemaloberti/PRDup

Member

thomassa commented Jul 9, 2014

Thank you for re-doing pullreq #1820 here, but this still isn't quite what we want. You have cherry-picked the commit that merged #1678 into the master branch, rather than cherry-picking the set of seven commits that are contained in #1678.

As I wrote on #1820,

Normally we do this sort of thing by using the git cherry-pick -x command on the set of commits that made up the original pull-request. That way we also get the history and original commit-messages.

You might find Jerome's pull-request duplicator tool useful:
https://github.com/xenserver/PRDup
https://github.com/jeromemaloberti/PRDup

@kaifengz

This comment has been minimized.

Show comment Hide comment
@kaifengz

kaifengz Jul 25, 2014

Created a new pull request #1848 as replacement; close this one.

Created a new pull request #1848 as replacement; close this one.

@kaifengz kaifengz closed this Jul 25, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment