drm-intel: Add note about patches that move code between files
PATCH 1/1 drm-intel: Add note about patches that move code between files
Patches that move big chunks of code between files can cause some complicated conflicts. Add a note to coordinate with maintainers before merging such patches.
--- drm-intel.rst | 4 ++++ 1 file changed, 4 insertions(+)
drm-intel.rst +4 -0
@@ -350,6 +350,10 @@ An inexhaustive list of details to check: http://developercertificate.org/. dim apply-branch should do this automatically for you. +* For patches that move around lots of code (file rename or extraction) please + coordinate with maintainers to avoid unnecessary pain with conflicts. Usually + some explicit merges are needed to avoid git getting lost. + On Confidence, Complexity, and Transparency -------------------------------------------
Signature · 6 lines
2.4.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 14 lines · Ander Conselvan de Oliveira
Patches that move big chunks of code between files can cause some complicated conflicts. Add a note to coordinate with maintainers before merging such patches.
Signed-off-by Ander Conselvan de Oliveira <[email protected]>--- drm-intel.rst | 4 ++++ 1 file changed, 4 insertions(+)drm-intel.rst +0
-0
drm-intel.rst An inexhaustive list of details to check: · line 358
Quoted 9 lines
drm-intel.rst +4
-0@@ -350,6 +350,10 @@ An inexhaustive list of details to check: http://developercertificate.org/. dim apply-branch should do this automatically for you. +* For patches that move around lots of code (file rename or extraction) please + coordinate with maintainers to avoid unnecessary pain with conflicts. Usually + some explicit merges are needed to avoid git getting lost. + On Confidence, Complexity, and Transparency -------------------------------------------
Perhaps also add a note about "git blame -C", as recently discussed here by Tvrtko & Arun in the thread "[PATCH 044/190] drm/i915: Move GEM request routines to i915_gem_request.c"?
.Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 19 lines · Dave Gordon
Quoted 18 lines · Ander Conselvan de Oliveira
Patches that move big chunks of code between files can cause some complicated conflicts. Add a note to coordinate with maintainers before merging such patches.
Signed-off-by: Ander Conselvan de Oliveira <
[email protected]>--- drm-intel.rst | 4 ++++ 1 file changed, 4 insertions(+)drm-intel.rst +0
-0@@ -350,6 +350,10 @@ An inexhaustive list of details to check: http://developercertificate.org/. dim apply-branch should do this automatically for you.
Quoted 12 lines
drm-intel.rst An inexhaustive list of details to check: · line 358
Quoted 8 lines
drm-intel.rst +1
-0+* For patches that move around lots of code (file rename or extraction)please
+ coordinate with maintainers to avoid unnecessary pain with conflicts. Usuallydrm-intel.rst +2
-0+ some explicit merges are needed to avoid git getting lost. + On Confidence, Complexity, and Transparency -------------------------------------------Perhaps also add a note about "git blame -C", as recently discussed here by Tvrtko & Arun in the thread "[PATCH 044/190] drm/i915: Move GEM request routines to
i915_gem_request.c"?
I think that would be a bit out of place here. What this patch changes is the list of things to check before merging a patch. It doesn't discuss the merits of moving code around and is not a dump for git tips and tricks. To keep the above list concise and on-topic, I'd rather leave that out.
I didn't know about 'git blame -C', however. Maybe we could have a list of useful git commands somewhere? Probably out of maintainer tools if it would include information that is useful when not merging patches. I'm not sure I would have read that list if it existed though. Last time I remember learning so mething new about git was when I stumbled upon git commit --fixup in Damien's blog, but that was a fairly random event.
Ander
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx