|
Cherry-picking the first commit
|
|
|
|
jcl@OH-DEV-JCL:~/ceph$ git cherry-pick -x 703ba37
|
|
error: could not apply 703ba37... librbd: acquire cache_lock before refreshing parent
|
|
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'
|
|
jcl@OH-DEV-JCL:~/ceph$ git status
|
|
On branch wip-5488-firefly
|
|
Your branch is up-to-date with 'origin/firefly'.
|
|
|
|
You are currently cherry-picking commit 703ba37.
|
|
(fix conflicts and run "git cherry-pick --continue")
|
|
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
|
|
|
|
Changes to be committed:
|
|
|
|
modified: src/librbd/ImageCtx.cc
|
|
|
|
Unmerged paths:
|
|
(use "git add <file>..." to mark resolution)
|
|
|
|
both modified: src/librbd/internal.cc
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: ceph-object-corpus (new commits)
|
|
modified: src/erasure-code/jerasure/jerasure (new commits)
|
|
modified: src/libs3 (new commits)
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
ceph-erasure-code-corpus/
|
|
src/ceph_erasure_code_non_regression
|
|
src/ceph_objectstore_tool
|
|
src/cephfs-journal-tool
|
|
src/rbd-replay
|
|
src/rbd-replay-prep
|
|
src/rocksdb/
|
|
src/tracing/
|
|
|
|
Cherry-picking the second commit
|
|
|
|
jcl@OH-DEV-JCL:~/ceph$ git cherry-pick -x b38c96f
|
|
error: could not apply b38c96f... librados_test_stub: AIO operation callbacks should be via Finisher
|
|
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'
|
|
jcl@OH-DEV-JCL:~/ceph$ git status
|
|
On branch wip-5488-firefly
|
|
Your branch is up-to-date with 'origin/firefly'.
|
|
|
|
You are currently cherry-picking commit b38c96f.
|
|
(fix conflicts and run "git cherry-pick --continue")
|
|
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
|
|
|
|
Unmerged paths:
|
|
(use "git add/rm <file>..." as appropriate to mark resolution)
|
|
|
|
deleted by us: src/test/librados_test_stub/TestIoCtxImpl.cc
|
|
deleted by us: src/test/librados_test_stub/TestMemIoCtxImpl.cc
|
|
deleted by us: src/test/librados_test_stub/TestRadosClient.cc
|
|
deleted by us: src/test/librados_test_stub/TestRadosClient.h
|
|
|
|
Changes not staged for commit:
|
|
(use "git add <file>..." to update what will be committed)
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
modified: ceph-object-corpus (new commits)
|
|
modified: src/erasure-code/jerasure/jerasure (new commits)
|
|
modified: src/libs3 (new commits)
|
|
|
|
Untracked files:
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
ceph-erasure-code-corpus/
|
|
src/ceph_erasure_code_non_regression
|
|
src/ceph_objectstore_tool
|
|
src/cephfs-journal-tool
|
|
src/rbd-replay
|
|
src/rbd-replay-prep
|
|
src/rocksdb/
|
|
src/tracing/
|