Skip to contentSkip to conversation

dim: add backmerge tool

PATCH New Daniel Vetter 1 participant 1 message Apr 3, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dim: add backmerge tool

Does a few sanity checks to avoid common gotchas:
- make sure the backmerge is in drm-tip already
- check that git rerere resolves all conflict, and cuation if not
- merge commit template.

---
 bash_completion |  2 +-
 dim             | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 dim.rst         |  7 +++++++
 3 files changed, 62 insertions(+), 1 deletion(-)
bash_completion +1 -1
index 7dfc4b86cb13..451db26aae8c 100644
@@ -75,7 +75,7 @@ _dim ()
 		checkpatch)
 			# FIXME needs a git sha1
 			;;
-		pull-request)
+		pull-request|backmerge)
 			if [[ $args == 2 ]]; then
 				COMPREPLY=( $( compgen -W "$nightly_branches" -- $cur ) )
 			elif [[ $args == 3 ]]; then
dim +54 -0

60 lines not on this page · raw message

dim.rst +7 -0
index bc4d9a0b2a76..b99248e24a8d 100644
@@ -360,6 +360,13 @@ apply-pull *branch*
 -------------------
 Reads a pull request mail from stdin and merges it into the given *branch*.
 
+backmerge *branch* *upstream*
+-----------------------------
+
+Backmerges *upstream* into *branch*, making a few sanity checks on the way. The
+*upstream* we backmerge should be the same as used for sending out pull requests
+using **pull-request**.
+
 update-next
 -----------
 Pushes out the latest dinq to drm-intel-next and tags it. Also
Signature · 6 lines
2.11.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel