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

[Daniel Vetter]

On Sun, Oct 8, 2017 at 5:00 PM, Noralf Trønnes <noralf at tronnes.org> wrote:
> Hi,
>
> Should I do something about this error:

Yes.

> notro at agl:~/drm-linux/src$ dim push-branch drm-misc-next
> Counting objects: 6, done.
> Delta compression using up to 4 threads.
> Compressing objects: 100% (6/6), done.
> Writing objects: 100% (6/6), 1.50 KiB | 0 bytes/s, done.
> Total 6 (delta 5), reused 0 (delta 0)
> To ssh://git.freedesktop.org/git/drm-misc
>    2f733d6..2e187b2  drm-misc-next -> drm-misc-next
> Pushing drm-misc-fixes to for-linux-next-fixes... Everything up-to-date
> Done.
> Out of merge window. Pushing drm-misc-next to for-linux-next... Done.
> Updating rerere cache... Done.
> Reloading nightly.conf... Done.
> dim: No git remote for any of the URLs ssh://git.freedesktop.org/git/drm-tip
> found in /home/notro/drm-linux/drm-tip
> Enter a name to auto-add this remote, leave blank to abort: drm-tip
> Fetching drm-tip (local remote drm-tip)... 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 airlied)... Done.
> Merging drm-intel (local remote drm-intel) drm-intel-fixes... Reset. Done.
> Merging drm-upstream (local remote airlied) 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... dim:
> dim: FAILURE: Could not merge drm-intel/drm-intel-next-queued
> dim: See the section "Resolving Conflicts when Rebuilding drm-tip"
> dim: in the drm-intel.rst documentation for how to handle this situation.

Follow the above instruction and see the section of the manual, it
explains what's going on. If you don't do this right away the next
person who pushes gets to clean up your conflict, which is not too
nice.

> Running dim update-branches afterwards didn't give any errors:

dim rebuild-tip is what failed, dim update-branches just pulls. Manual
should explain it all in more detail.
-Daniel

> notro at agl:~/drm-linux/src$ dim update-branches
> Fetching linux (local remote origin)... 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 airlied)... Done.
> Already on 'drm-misc-next'
> Your branch is up-to-date with 'drm-misc/drm-misc-next'.
> Already up-to-date.
> Updating maintainer-tools ...
> Current branch maintainer-tools is up to date.
> Updating rerere cache... Done.
>
> Noralf.
>
>
> _______________________________________________
> dim-tools mailing list
> dim-tools at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch