rbd jewel backports related to mirroring

rbd jewel backports related to mirroring

[Loic Dachary]

Hi Jason,

While working on jewel backports I noticed that there are a number of rbd backports ( http://tracker.ceph.com/projects/ceph/issues?per_page=100&query_id=96 ) related to mirroring. At least three of them do not apply cleanly and I suspect they are interdependant. Is there a way to figure out the order in which they should be applied ? If not I'll sort it out anyway, no worries ;-)

Cheers
-- 
Loïc Dachary, Artisan Logiciel Libre
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: rbd jewel backports related to mirroring

[Jason Dillaman]

My usual strategy just involves running "git cherry-pick -x" against
any prior commits associated with the file with the merge conflict (I
usually try to pull in the whole PR instead of just the single commit
causing the merge conflict). These extra cherry-picks will be cleanly
merged away when the PRs are merged into a single branch.  I usually
run "git log --graph --decorate --date=relative --oneline" to see the
associated PRs of prior commits.

On Wed, Jun 29, 2016 at 5:07 AM, Loic Dachary <loic@dachary.org> wrote:
> Hi Jason,
>
> While working on jewel backports I noticed that there are a number of rbd backports ( http://tracker.ceph.com/projects/ceph/issues?per_page=100&query_id=96 ) related to mirroring. At least three of them do not apply cleanly and I suspect they are interdependant. Is there a way to figure out the order in which they should be applied ? If not I'll sort it out anyway, no worries ;-)
>
> Cheers
> --
> Loïc Dachary, Artisan Logiciel Libre



-- 
Jason
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: rbd jewel backports related to mirroring

[Loic Dachary]

Thanks for the hint, I'll try that.

On 29/06/2016 14:43, Jason Dillaman wrote:
> My usual strategy just involves running "git cherry-pick -x" against
> any prior commits associated with the file with the merge conflict (I
> usually try to pull in the whole PR instead of just the single commit
> causing the merge conflict). These extra cherry-picks will be cleanly
> merged away when the PRs are merged into a single branch.  I usually
> run "git log --graph --decorate --date=relative --oneline" to see the
> associated PRs of prior commits.
> 
> On Wed, Jun 29, 2016 at 5:07 AM, Loic Dachary <loic@dachary.org> wrote:
>> Hi Jason,
>>
>> While working on jewel backports I noticed that there are a number of rbd backports ( http://tracker.ceph.com/projects/ceph/issues?per_page=100&query_id=96 ) related to mirroring. At least three of them do not apply cleanly and I suspect they are interdependant. Is there a way to figure out the order in which they should be applied ? If not I'll sort it out anyway, no worries ;-)
>>
>> Cheers
>> --
>> Loïc Dachary, Artisan Logiciel Libre
> 
> 
> 

-- 
Loïc Dachary, Artisan Logiciel Libre
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html