On Thu, 08 Dec 2016, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote: > It's been years since drm-intel had only one maintainer, and the > primary use-case for dim ub was only to sync between machines. Update > the docs to reflect this, to avoid misleading committers. Also update > the maintainer-tools branch, which is something Paulo's script also > does. > > Motivated because Paulo typed an actualize.sh script which does > exactly what dim ub is meant to do. > > v2: Also update quickstart guide. > > v3: And spelling fixes. > > Acked-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx> > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx> > --- > dim | 3 +++ > dim.rst | 11 ++++++----- > 2 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/dim b/dim > index e0551ace54e4..3e82de96b4ab 100755 > --- a/dim > +++ b/dim > @@ -1293,6 +1293,9 @@ function dim_update_branches > dim_checkout drm-intel-next > $DRY git reset --hard $DIM_DRM_INTEL_REMOTE/drm-intel-next > > + cd $DIM_PREFIX/maintainer-tools > + git pull --rebase > + Ooops? > update_rerere_cache > } > > diff --git a/dim.rst b/dim.rst > index 0c52ab43e400..b9cb41a2ba5b 100644 > --- a/dim.rst > +++ b/dim.rst > @@ -74,11 +74,8 @@ Setup git maintainer branches in the given prefix. > > update-branches > --------------- > -Updates all maintainer branches. Only needs to be run to synchronize branches > -between different machines (or maintainers fwiw). As long a given branch is > -always maintained from the same machine, even if different branches are > -maintained on different machines (by different maintainers), there's no need to > -run this command. > +Updates all maintainer branches. Useful to synchronize all branches when other > +maintainers and committers pushed patches meanwhile. > > status > ------ > @@ -408,6 +405,10 @@ corresponding to this repository is defined by DIM_DRM_INTEL in your .dimrc. > You should also have directories called maintainer-tools, drm-tip (for > rebuilding the tree), and drm-intel-rerere for some dim-internal book-keeping. > > +If someone else has pushed patches first resync using:: > + > + $ dim update-branches > + > Applying patches to dinq is done in the main repository with:: > > $ cat patch.mbox | dim apply-queued -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
