[{"id":4366,"web_url":"https://patchwork.libcamera.org/comment/4366/","msgid":"<20200402104539.GA13793@pendragon.ideasonboard.com>","date":"2020-04-02T10:45:39","subject":"Re: [libcamera-devel] [PATCH v4.1 3/3] libcamera: Prevent merge\n\tconflicts","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Wed, Apr 01, 2020 at 10:15:53AM +0100, Kieran Bingham wrote:\n> Merge conflicts are a terrible effect of rebasing code, and they impede\n> the development process.\n> \n> Provide a useful helper header to ensure that merge-conflicts are no\n> longer an issue, and make sure that both sides of the conflict are\n> compile tested on average at least every other compile cycle. Based on\n> reliable advice from [0].\n> \n> [0] https://twitter.com/erdgeist/status/1197283439000637441\n> \n> Signed-off-by: Kieran Bingham \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\n> \n> diff --git a/src/libcamera/include/merge_conflicts.h b/src/libcamera/include/merge_conflicts.h\n> new file mode 100644\n> index 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\nI'm afraid this doesn't compile :-( Would you be able to work on a fix\nwith the priority deserved by the high added value ?\n\n> +\n> +#endif\n> +\n> +} /* namespace libcamera */\n> +\n> +#endif /* __LIBCAMERA_MERGE_CONFLICT_H__ */","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 38A49629B9\n\tfor ;\n\tThu, 2 Apr 2020 12:45:47 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9AF6180E;\n\tThu, 2 Apr 2020 12:45:46 +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=\"U2rjrKF7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1585824346;\n\tbh=sl6BspIRHfhcTfQtPu5wtH0bUKC1qLA+3zkxtsdR27M=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=U2rjrKF7DOvcszc9FabUDmN1OwbyVlw3qFBCzYx+Y5DZdEOsnsQeWjzUt/YBKzg36\n\tazKVuA2LppOhbOGUR6w0WFu3X41xQndIil6dbdtBfOMa3Ih8AAjaBMPhN/V6xA/pDC\n\tromWw9WXLfSfjtvdh53LBNryfkMopwOcOSYppbek=","Date":"Thu, 2 Apr 2020 13:45:39 +0300","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera devel ","Message-ID":"<20200402104539.GA13793@pendragon.ideasonboard.com>","References":"<20200401091553.28187-1-kieran.bingham@ideasonboard.com>\n\t<20200401091553.28187-4-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200401091553.28187-4-kieran.bingham@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 02 Apr 2020 10:45:47 -0000"}},{"id":4367,"web_url":"https://patchwork.libcamera.org/comment/4367/","msgid":"","date":"2020-04-02T10:57:00","subject":"Re: [libcamera-devel] [PATCH v4.1 3/3] libcamera: Prevent merge\n\tconflicts","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 02/04/2020 11:45, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> Thank you for the patch.\n> \n> On Wed, Apr 01, 2020 at 10:15:53AM +0100, Kieran Bingham wrote:\n>> Merge conflicts are a terrible effect of rebasing code, and they impede\n>> the development process.\n>>\n>> Provide a useful helper header to ensure that merge-conflicts are no\n>> longer an issue, and make sure that both sides of the conflict are\n>> compile tested on average at least every other compile cycle. Based on\n>> reliable advice from [0].\n>>\n>> [0] https://twitter.com/erdgeist/status/1197283439000637441\n>>\n>> Signed-off-by: Kieran Bingham \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\n>>\n>> diff --git a/src/libcamera/include/merge_conflicts.h b/src/libcamera/include/merge_conflicts.h\n>> new file mode 100644\n>> index 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> I'm afraid this doesn't compile :-( Would you be able to work on a fix\n> with the priority deserved by the high added value ?\n\nI'm sorry for the confusion, I should have stated in the commit message.\nIt works perfectly when you upgrade your c-pre-processor to v20.4.1.\n\n--\nKieran\n\n\n>> +\n>> +#endif\n>> +\n>> +} /* namespace libcamera */\n>> +\n>> +#endif /* __LIBCAMERA_MERGE_CONFLICT_H__ */\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9DA75629B9\n\tfor ;\n\tThu, 2 Apr 2020 12:57:03 +0200 (CEST)","from [192.168.0.20]\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 F36E180E;\n\tThu, 2 Apr 2020 12:57:02 +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=\"YPAaO6E1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1585825023;\n\tbh=jlisVDzWBlgUtk/dm+9JnyMcHoydsinC/PkYokWCajU=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=YPAaO6E1Qv3AoP/rI2h6kWlhmAen8i010QUEwDhNKMU1sjH/9qGbQrtXFzZWd4wjS\n\tIr8fWk1xE5lGhXQ/xuQSF8LGUQajLoJsr4D9UJm8F4bv7SdnBNmRk/8T0r5akpJnPm\n\tjlSekSh3FnO2P97zZKWi4Pi8LUTfMHRkd9uBAQ5Y=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ","Cc":"libcamera devel ","References":"<20200401091553.28187-1-kieran.bingham@ideasonboard.com>\n\t<20200401091553.28187-4-kieran.bingham@ideasonboard.com>\n\t<20200402104539.GA13793@pendragon.ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Thu, 2 Apr 2020 11:57:00 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200402104539.GA13793@pendragon.ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 02 Apr 2020 10:57:03 -0000"}}]