dim: FAILURE: Could not merge drm-intel/drm-intel-next-queued

[Noralf Trønnes]

Den 10.10.2017 10.33, skrev Daniel Vetter:
> On Tue, Oct 10, 2017 at 12:32 AM, Noralf Trønnes <noralf at tronnes.org> wrote:
>> Den 10.10.2017 00.09, skrev Jani Nikula:
>>> On Mon, 09 Oct 2017, Noralf Trønnes <noralf at tronnes.org> wrote:
>>>> Den 09.10.2017 22.37, skrev Jani Nikula:
>>>>> What's your git version?
>>>>>
>>>>> What does 'cat ~/drm-linux/drm-tip/.git' say?
>>>> notro at agl:~/drm-linux/drm-tip$ git --version
>>>> git version 2.7.4
>>> That might explain the conflict. git versions are known to have slightly
>>> different conflicts. Vesion 2.11.0 here, and dim rebuild-tip worked just
>>> fine.
>>>
>>>> notro at agl:~/drm-linux/drm-tip$ cat ~/drm-linux/drm-tip/.git
>>>> gitdir: /home/notro/drm-linux/src/.git/worktrees/drm-tip
>>> Odd. Did you not have ssh:// remote to drm-tip previously? How did you
>>> push it...?
>>
>> I used: dim push-branch drm-misc-next
>>
>> I have updated git and got version 2.14.2.
>>
>> If you don't need me to do any forensics here to improve dim, I think
>> I'll just kill off this installation and start off with a fresh: dim setup.
> Yeah I think the older git version is explanation enough for why it
> couldn't re-apply the stored resolution for the conflict (so wasn't
> really your conflict).
>
> With the pristine dim setup, pls run dim rebuild-tip once to make sure
> it's now all working.

Seems to be working fine now:

notro at agl:~/drm-linux/src$ dim rebuild-tip
Updating rerere cache... Done.
Reloading nightly.conf... Done.
Fetching sound-upstream (local remote sound)... Done.
Fetching drm-intel (local remote drm-intel)... Done.
Fetching drm-tip (local remote drm-tip)... Done.
Fetching drm-misc (local remote drm-misc)... Done.
Fetching linux-upstream (local remote origin)... Done.
Fetching drm-amd (local remote drm-amd)... Done.
Fetching drm-upstream (local remote linux)... Done.
Merging drm-intel (local remote drm-intel) drm-intel-fixes... Reset. Done.
Merging drm-upstream (local remote linux) drm-fixes... Fast-forward. Done.
Merging drm-intel (local remote drm-intel) drm-intel-next-fixes... 
Fast-forward. Done.
Merging drm-intel (local remote drm-intel) drm-intel-next-queued... Done.
Merging drm-upstream (local remote linux) drm-next... Done.
Merging sound-upstream (local remote sound) for-next... Done.
Merging sound-upstream (local remote sound) for-linus... Done.
Merging drm-intel (local remote drm-intel) topic/core-for-CI... Done.
Merging drm-misc (local remote drm-misc) drm-misc-next... Done.
Merging drm-misc (local remote drm-misc) drm-misc-next-fixes... 
Fast-forward. Done.
Merging drm-misc (local remote drm-misc) drm-misc-fixes... Done.
Merging drm-amd (local remote drm-amd) drm-amd-next... Fast-forward. Done.
Merging drm-amd (local remote drm-amd) drm-amd-next-fixes... 
Fast-forward. Done.
Merging drm-amd (local remote drm-amd) drm-amd-fixes... Fast-forward. Done.
Adding integration manifest drm-tip: 2017y-10m-10d-15h-14m-09s UTC... Done.
Pushing drm-tip... Done.
Updating rerere cache... New commit. Pushing rerere cache... Done.


Are these remotes correct?

notro at agl:~/drm-linux/src$ git remote -v
drm-amd ssh://git.freedesktop.org/git/drm/drm-amd (fetch)
drm-amd ssh://git.freedesktop.org/git/drm/drm-amd (push)
drm-intel       ssh://git.freedesktop.org/git/drm-intel (fetch)
drm-intel       ssh://git.freedesktop.org/git/drm-intel (push)
drm-misc        ssh://git.freedesktop.org/git/drm-misc (fetch)
drm-misc        ssh://git.freedesktop.org/git/drm-misc (push)
drm-tip ssh://git.freedesktop.org/git/drm-tip (fetch)
drm-tip ssh://git.freedesktop.org/git/drm-tip (push)
linux   git://people.freedesktop.org/~airlied/linux (fetch)
linux   git://people.freedesktop.org/~airlied/linux (push)
origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 
(fetch)
origin git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 
(push)
sound git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git (fetch)
sound git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git (push)

I used the dim defaults for everything, except I had to add drm-misc by 
hand.

Thanks, Noralf.


> Thanks, Daniel
>
>> Noralf.
>>
>>
>>> BR,
>>> Jani.
>>>
>
>