Need urgent help with samba4 DC re-join

[Andreas Oster]

Am 18.07.2012 09:48, schrieb Andrew Bartlett:
> On Wed, 2012-07-18 at 09:20 +0200, Andreas Oster wrote:
>> Am 18.07.2012 08:11, schrieb Andreas Oster:
>>> Am 18.07.2012 08:03, schrieb Andrew Bartlett:
>>>> On Wed, 2012-07-18 at 07:10 +0200, Andreas Oster wrote:
>>>>
>>>>> Hello Andrew,
>>>>>
>>>>> unfortunately dbcheck did not work. The following error messages showed up:
>>>>>
>>>>> ERROR: wrong instanceType 11 on DC=DomainDnsZones,DC=novanetwork,DC=loc,
>>>>> should be 13
>>>>> ERROR(<type 'exceptions.AttributeError'>): uncaught exception -
>>>>> 'dbcheck' object has no attribute 'modify_instancetype'
>>>>>   File
>>>>
>>>> Thanks.  I've updated my branch with what I hope will be a fix.  This
>>>> time I've modified a local DB to replicate your error condition, and
>>>> confirmed it all works.
>>>>
>>>> However, it will only allow the instanceType to be changed, the
>>>> objectClass can't be fixed yet.  But if you can confirm what I have so
>>>> far works for you, I'll see what I can do about the rest.
>>>>
>>>> Thanks,
>>>>
>>>> Andrew Bartlett
>>>>
>>> Hello Andrew,
>>>
>>> thank you, I will test with your changed patches and will report back.
>>>
>>> Andreas
>>>
>>>
>> Hello Andrew,
>>
>> just to be sure, do I have to pull the sources from your git tree or is
>> it sufficient to get the diffs from your tree and patch the master
>> sources ? If so which are the diffs I would need ?
> 
> My tree is on top of current master, but it will be simplest to check
> out my tree.
> 
> it should be something like
> git remote add abartlet git://git.samba.org/abartlet/samba.git
> git checkout abartlet/repl-devel -b repl-devel
> 
> Andrew Bartlett
> 
Hi Andrew

I've pulled the vanilla master then did
git remote add abartlet git://git.samba.org/abartlet/samba.git
which succeeds without errors, but when doing

git checkout abartlet/repl-devel -b repl-devel

i get :

fatal: git checkout: updating paths is incompatible with switching branches.
Did you intend to checkout 'abartlet/repl-devel' which can not be
resolved as commit?

sorry that I have to plague you, but I am not familiar with those git
commands.

Thanks

Andreas