Project

General

Profile

PR4013-CherryPick.txt

Jean-Charles Lopez, 04/06/2015 01:15 AM

Download (2.86 KB)

 
1
Cherry-picking the first commit
2

    
3
jcl@OH-DEV-JCL:~/ceph$ git cherry-pick -x 703ba37
4
error: could not apply 703ba37... librbd: acquire cache_lock before refreshing parent
5
hint: after resolving the conflicts, mark the corrected paths
6
hint: with 'git add <paths>' or 'git rm <paths>'
7
hint: and commit the result with 'git commit'
8
jcl@OH-DEV-JCL:~/ceph$ git status
9
On branch wip-5488-firefly
10
Your branch is up-to-date with 'origin/firefly'.
11

    
12
You are currently cherry-picking commit 703ba37.
13
  (fix conflicts and run "git cherry-pick --continue")
14
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
15

    
16
Changes to be committed:
17

    
18
	modified:   src/librbd/ImageCtx.cc
19

    
20
Unmerged paths:
21
  (use "git add <file>..." to mark resolution)
22

    
23
	both modified:      src/librbd/internal.cc
24

    
25
Changes not staged for commit:
26
  (use "git add <file>..." to update what will be committed)
27
  (use "git checkout -- <file>..." to discard changes in working directory)
28

    
29
	modified:   ceph-object-corpus (new commits)
30
	modified:   src/erasure-code/jerasure/jerasure (new commits)
31
	modified:   src/libs3 (new commits)
32

    
33
Untracked files:
34
  (use "git add <file>..." to include in what will be committed)
35

    
36
	ceph-erasure-code-corpus/
37
	src/ceph_erasure_code_non_regression
38
	src/ceph_objectstore_tool
39
	src/cephfs-journal-tool
40
	src/rbd-replay
41
	src/rbd-replay-prep
42
	src/rocksdb/
43
	src/tracing/
44

    
45
Cherry-picking the second commit
46

    
47
jcl@OH-DEV-JCL:~/ceph$ git cherry-pick -x b38c96f
48
error: could not apply b38c96f... librados_test_stub: AIO operation callbacks should be via Finisher
49
hint: after resolving the conflicts, mark the corrected paths
50
hint: with 'git add <paths>' or 'git rm <paths>'
51
hint: and commit the result with 'git commit'
52
jcl@OH-DEV-JCL:~/ceph$ git status
53
On branch wip-5488-firefly
54
Your branch is up-to-date with 'origin/firefly'.
55

    
56
You are currently cherry-picking commit b38c96f.
57
  (fix conflicts and run "git cherry-pick --continue")
58
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)
59

    
60
Unmerged paths:
61
  (use "git add/rm <file>..." as appropriate to mark resolution)
62

    
63
	deleted by us:      src/test/librados_test_stub/TestIoCtxImpl.cc
64
	deleted by us:      src/test/librados_test_stub/TestMemIoCtxImpl.cc
65
	deleted by us:      src/test/librados_test_stub/TestRadosClient.cc
66
	deleted by us:      src/test/librados_test_stub/TestRadosClient.h
67

    
68
Changes not staged for commit:
69
  (use "git add <file>..." to update what will be committed)
70
  (use "git checkout -- <file>..." to discard changes in working directory)
71

    
72
	modified:   ceph-object-corpus (new commits)
73
	modified:   src/erasure-code/jerasure/jerasure (new commits)
74
	modified:   src/libs3 (new commits)
75

    
76
Untracked files:
77
  (use "git add <file>..." to include in what will be committed)
78

    
79
	ceph-erasure-code-corpus/
80
	src/ceph_erasure_code_non_regression
81
	src/ceph_objectstore_tool
82
	src/cephfs-journal-tool
83
	src/rbd-replay
84
	src/rbd-replay-prep
85
	src/rocksdb/
86
	src/tracing/