Hi Martin,

On 08/26/2015 09:58 AM, Martin Basti wrote:



On 08/25/2015 06:41 PM, Oleg Fayans wrote:
Hi Martin,

On 08/24/2015 04:35 PM, Martin Basti wrote:


On 08/24/2015 12:55 PM, Oleg Fayans wrote:
Hi all. The current issue [1] effectively blocks testing of 4.2
branch. Here is (one of the possible) solution, that proved to work.

[1]
https://www.redhat.com/archives/freeipa-devel/2015-August/msg00085.html



The patch needs rebase for ipa-4-2 branch.
What is the best way to do it?
git checkout --track origin/ipa-4-2
And then commit the same changes again?


I usually do cherrypick, or just apply patch on top of ipa-4-2 branch
with threeway merge (git am -3 option)

I had discussion, yesterday, with Honza, and maybe this is not the
correct fix.
We are in hurry today with RHEL 7.2, but later I may send updated patch

Cool, I'll wait then.

--
Oleg Fayans
Quality Engineer
FreeIPA team
RedHat.

--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to