Reference drm-tip, use $integration_config, or just drop old/stale
comments.
Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
---
dim | 18 ++++++++----------
dim.rst | 13 ++++---------
drm-intel.rst | 6 +++---
3 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/dim b/dim
index ffaadbbc5617..5d0f63fc9229 100755
--- a/dim
+++ b/dim
@@ -342,7 +342,7 @@ function check_conflicts # tree
# we need an empty line to make it look pretty
echoerr ""
echoerr "FAILURE: Could not merge $1"
- echoerr "See the section \"Resolving Conflicts when Rebuilding drm-intel-nightly\""
+ echoerr "See the section \"Resolving Conflicts when Rebuilding drm-tip\""
echoerr "in the drm-intel.rst documentation for how to handle this situation."
exit 1
fi
@@ -464,10 +464,10 @@ function dim_rebuild_tip
git commit --quiet -m "$integration_branch: $time integration manifest"
echo "Done."
- local nightly_remote=`url_to_remote $drm_tip_ssh`
+ local tip_remote=`url_to_remote $drm_tip_ssh`
echo -n "Pushing $integration_branch... "
- git push $DRY_RUN $nightly_remote +HEAD >& /dev/null && echo "Done."
+ git push $DRY_RUN $tip_remote +HEAD >& /dev/null && echo "Done."
echo -n "Updating rerere cache... "
cd $rerere
@@ -492,7 +492,7 @@ function dim_rebuild_tip
exit 1
fi
}
-# push branch $1, rebuild nightly. the rest of the arguments are passed to git
+# push branch $1, rebuild drm-tip. the rest of the arguments are passed to git
# push.
function dim_push_branch
{
@@ -600,7 +600,6 @@ function dim_cherry_pick
sha=`git rev-parse $1`
sha_short=${sha:0:8}
- # need latest -nightly
git fetch $remote
echo Possible fixup patches for your cherry-pick:
git log --grep=$sha_short --pretty=oneline $sha..$remote/drm-tip
@@ -770,7 +769,7 @@ function dim_remove_branch
local repo=`branch_to_repo $branch`
if [[ $repo == "" ]] ; then
- echoerr "$branch not found in nightly.conf"
+ echoerr "$branch not found in $integration_config"
exit 1
fi
@@ -817,7 +816,7 @@ function dim_checkout
fi
if [[ $repo == "" ]] ; then
- echoerr "$branch not found in nightly.conf"
+ echoerr "$branch not found in $integration_config"
exit 1
fi
@@ -1054,7 +1053,7 @@ function dim_update_next_continue
$DRY git tag -f -a $tag $DIM_DRM_INTEL_REMOTE/drm-intel-next
git push $DRY_RUN -f $DIM_DRM_INTEL_REMOTE $tag
- echo "Updating -testing to latest -nightly"
+ echo "Updating drm-intel-testing to latest drm-tip"
git push $DRY_RUN $DIM_DRM_INTEL_REMOTE +$remote/drm-tip:drm-intel-testing
$DRY git tag -f drm-intel-testing-$today $DIM_DRM_INTEL_REMOTE/drm-intel-testing
$DRY git push -f $DIM_DRM_INTEL_REMOTE drm-intel-testing-$today
@@ -1209,8 +1208,7 @@ function dim_update_branches
done
dim_checkout drm-intel-next
$DRY git reset --hard $DIM_DRM_INTEL_REMOTE/drm-intel-next
- # TODO: Restore -nightly merge state from the rerere-cache
- # branch
+
update_rerere_cache
}
diff --git a/dim.rst b/dim.rst
index bc8cb160bf1f..9a045a43e7b7 100644
--- a/dim.rst
+++ b/dim.rst
@@ -72,11 +72,6 @@ setup *prefix*
--------------
Setup git maintainer branches in the given prefix.
-nightly-forget
---------------
-Forget git rerere solutions for nightly merges in case they
-contain a bogus merge resolution.
-
update-branches
---------------
Updates all maintainer branches. Only needs to be run to synchronize branches
@@ -96,13 +91,13 @@ When a stored conflict resolution in the integration tree is wrong, this command
can be used to fix up the mess. First figure out which commit in the
*rerere-cache* branch contains the bogus conflict resolution, then revert it
using this command. This ensures the resolution is also purged from any local
-caches, to make sure it doesn't get resurrected. Then run *rebuild-nightly* to
+caches, to make sure it doesn't get resurrected. Then run *rebuild-tip* to
redo the merges, correctly.
cat-to-fixup
------------
-Pipes stdin into the fixup patch file for the current -nightly merge.
+Pipes stdin into the fixup patch file for the current drm-tip merge.
push-branch branch [*git push arguments*]
-----------------------------------------
@@ -245,12 +240,12 @@ goes wrong.
update-next
-----------
Pushes out the latest dinq to drm-intel-next and tags it. Also
-pushes out the latest nightly to drm-intel-testing. For an
+pushes out the latest drm-tip to drm-intel-testing. For an
overview a gitk view of the currently unmerged feature pile is
opened.
Also checks that the drm-intel-fixes|-next-queued are fully
-merged into -nightly to avoid operator error.
+merged into drm-tip to avoid operator error.
tag-next
--------
diff --git a/drm-intel.rst b/drm-intel.rst
index e9cf240c4048..79db1cf64bcb 100644
--- a/drm-intel.rst
+++ b/drm-intel.rst
@@ -241,9 +241,9 @@ when it's tricky or something fails in the below procedure.
1. First check that drm-intel-next-queued was indeed pushed correctly and that
your local and remote branches match.
-2. Then re-run the -nightly generation just to confirm: ::
+2. Then rebuild the integration branch just to confirm: ::
- $ dim rebuild-nightly
+ $ dim rebuild-tip
It's handy to keep the log output for context so that you know which branch
caused the conflicts, and which branches are already included.
@@ -268,7 +268,7 @@ when it's tricky or something fails in the below procedure.
match up your resolution with the conflict for odd reasons) and to make sure
there's no other conflict in later merges: ::
- $ dim rebuild-nightly
+ $ dim rebuild-tip
This will also push the stored conflict resolution to the drm-intel-rerere
branch and therefore publishes your resolution. Everything before this step
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
