Patch Detail
Show a patch.
GET /api/patches/3366/?format=api
{ "id": 3366, "url": "https://patchwork.libcamera.org/api/patches/3366/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3366/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200401091553.28187-4-kieran.bingham@ideasonboard.com>", "date": "2020-04-01T09:15:53", "name": "[libcamera-devel,v4.1,3/3] libcamera: Prevent merge conflicts", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "5dbc3184db70ff0f7d3330b787c878b56df205f1", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/3366/mbox/", "series": [ { "id": 791, "url": "https://patchwork.libcamera.org/api/series/791/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=791", "date": "2020-04-01T09:15:50", "name": "Miscellaneous Code Improvements for mаster", "version": 1, "mbox": "https://patchwork.libcamera.org/series/791/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3366/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3366/checks/", "tags": {}, "headers": { "Return-Path": "<kieran.bingham@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A5DDF629B9\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 1 Apr 2020 11:16:01 +0200 (CEST)", "from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3F124A2A;\n\tWed, 1 Apr 2020 11:16:01 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"lFFK8pYe\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1585732561;\n\tbh=GpF2dkXKeMMZE7AeGqdoE5dN1XnouXFhm9PyzUD4ac0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=lFFK8pYepIrW3TZbkJCH8cOmgE8hzDekm6FrfQzy6RyZM1XZfUvNzPtuqQrDinqXK\n\tK4dvc+pYsumy0uyavhkvaiBqCki7CNS0ctkwoiBssJoWUSkiWYu0xyEE0hODpltidV\n\t11fGImA121PgXsWMaoml4pCrcze0j8zmqcjLfvTI=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>", "Date": "Wed, 1 Apr 2020 10:15:53 +0100", "Message-Id": "<20200401091553.28187-4-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200401091553.28187-1-kieran.bingham@ideasonboard.com>", "References": "<20200401091553.28187-1-kieran.bingham@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v4.1 3/3] libcamera: Prevent merge\n\tconflicts", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Wed, 01 Apr 2020 09:16:01 -0000" }, "content": "Merge conflicts are a terrible effect of rebasing code, and they impede\nthe development process.\n\nProvide a useful helper header to ensure that merge-conflicts are no\nlonger an issue, and make sure that both sides of the conflict are\ncompile tested on average at least every other compile cycle. Based on\nreliable advice from [0].\n\n [0] https://twitter.com/erdgeist/status/1197283439000637441\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/libcamera/include/merge_conflicts.h | 23 +++++++++++++++++++++++\n 1 file changed, 23 insertions(+)\n create mode 100644 src/libcamera/include/merge_conflicts.h", "diff": "diff --git a/src/libcamera/include/merge_conflicts.h b/src/libcamera/include/merge_conflicts.h\nnew file mode 100644\nindex 000000000000..6e5b69a78c7a\n--- /dev/null\n+++ b/src/libcamera/include/merge_conflicts.h\n@@ -0,0 +1,23 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Kieran Bingham\n+ *\n+ * merge_conflicts.h - Automatic merge conflict resolution\n+ */\n+\n+#ifndef __LIBCAMERA_MERGE_CONFLICT_H__\n+#define __LIBCAMERA_MERGE_CONFLICT_H__\n+\n+namespace libcamera {\n+\n+#ifndef __DOXYGEN__\n+\n+#define <<<<<<<< #if RANDOM % 2\n+#define ======== #else\n+#define >>>>>>>> #endif\n+\n+#endif\n+\n+} /* namespace libcamera */\n+\n+#endif /* __LIBCAMERA_MERGE_CONFLICT_H__ */\n", "prefixes": [ "libcamera-devel", "v4.1", "3/3" ] }