Encodes the best practices for undoing a botched-up conflict resolution.
Signed-off-by: Daniel Vetter daniel.vetter@intel.com --- dim | 7 +++++++ dim.rst | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/dim b/dim index d01407a7b10c..91aa99f230e7 100755 --- a/dim +++ b/dim @@ -298,6 +298,13 @@ function update_rerere_cache cd - }
+function dim_revert_rerere +{ + cd $DIM_PREFIX/drm-rerere/ + git revert $1 + rm `rr_cache_dir`/* -Rf +} + function dim_rebuild_nightly { local integration_branch=drm-tip diff --git a/dim.rst b/dim.rst index dd4ba0fc5720..ca9670ebc1b5 100644 --- a/dim.rst +++ b/dim.rst @@ -9,7 +9,7 @@ drm-intel maintainer script :Author: Daniel Vetter daniel.vetter@ffwll.ch :Author: Jani Nikula jani.nikula@intel.com :Date: 2014-05-15 -:Copyright: 2012-2015 Intel Corporation +:Copyright: 2012-2016 Intel Corporation :Manual section: 1 :Manual group: maintainer tools
@@ -90,6 +90,16 @@ rebuild-nightly Rebuilds the nightly branch. Useful when ad-hoc trees are included in -nightly.
+revert-rerere *rerere-chache-commit-ish* +---------------------------------------- + +When a stored conflict resolution in the integration tree 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 redo the +merges, correctly. + cat-to-fixup ------------