From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00641c01.pphosted.com (mx0a-00641c01.pphosted.com [205.220.165.146]) by sourceware.org (Postfix) with ESMTPS id B67CA3858015 for ; Thu, 11 Jan 2024 12:22:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B67CA3858015 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=gcc.gnu.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B67CA3858015 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=205.220.165.146 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704975780; cv=none; b=QwzFQyIrw26Sf1Cg6KdGhnkLxRjqXj1+t7WK46sqtbU+h2leiFez9sOxlY/BnvQeNtbrDwkc4wyhQHlZvmctfM/MrUoiPUiAkv+ltuafo/9+IpzxUl9uQySUpuHO3o1eW0RRSb0g8oTSCfhQ87d5M7UH7RCZVUvmfb/T73iyYyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1704975780; c=relaxed/simple; bh=K028Z6kE9RSc8EPDOLnp/tcFaa2uFgNC6ZyZPpeQEFA=; h=MIME-Version:From:Date:Message-ID:Subject:To; b=SzMDOLmbdaw+cUL8b9HQj8AhhaoiKIQHtEKiqpYcXUwn/F1nAUQEhl1M/VkAXCeC2HpWPuYSjJoz2SKbcOJc6qyu8grMPtSkSlcZCxBX5y2gd58cHhiUI3Jt7bZkB8vQmEncXKZPg0VSeVOpIOIH7v74Yvx6Cn2TOVk1KgI07cw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0247475.ppops.net [127.0.0.1]) by mx0a-00641c01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 40BCD5tt001403 for ; Thu, 11 Jan 2024 12:22:57 GMT Received: from mxout26.s.uw.edu (mxout26.s.uw.edu [140.142.234.176]) by mx0a-00641c01.pphosted.com (PPS) with ESMTPS id 3vj56y2pax-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 11 Jan 2024 12:22:57 +0000 Received: from smtp.washington.edu (smtp.washington.edu [128.208.60.54]) by mxout26.s.uw.edu (8.14.4+UW20.07/8.14.4+UW22.04) with ESMTP id 40BCMuUV019140 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 11 Jan 2024 04:22:56 -0800 X-Auth-Received: from mail-ua1-f43.google.com (mail-ua1-f43.google.com [209.85.222.43]) (authenticated authid=kmatsui) by smtp.washington.edu (8.16.1+UW21.10/8.14.4+UW19.10) with ESMTPSA id 40BCMtig014286 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 11 Jan 2024 04:22:56 -0800 X-UW-Orig-Sender: kmatsui@smtp.washington.edu Received: by mail-ua1-f43.google.com with SMTP id a1e0cc1a2514c-7ce4512cc24so1493154241.2 for ; Thu, 11 Jan 2024 04:22:56 -0800 (PST) X-Gm-Message-State: AOJu0YwmpfBivXHbSvp7+zNuwpTQVaBkAZLmZEOuCU5s8Xb9RicaM/c4 BZn/lIervD2Avt2/UhupK2SRWQ0PSXHxdrxsJ+wep1ZkVBWH X-Google-Smtp-Source: AGHT+IHYxw76LCqg+nUrBCyHwPhAFFvCNpCrFG7ty6+zKc6YsY3Q8Y+7oGrSomKZI4Jhg3LEML9cai7QcQbd7xN8A+A= X-Received: by 2002:a05:6102:3661:b0:468:10e4:4c5a with SMTP id bg1-20020a056102366100b0046810e44c5amr58754vsb.67.1704975775151; Thu, 11 Jan 2024 04:22:55 -0800 (PST) MIME-Version: 1.0 References: <20240111062222.525186-1-kmatsui@gcc.gnu.org> <20240111094038.876653-1-kmatsui@gcc.gnu.org> <2wigagpsd7hvcrkft6hqffegnbkwpjuzhc6kokr4ehc5usvvim@c4mck6frsns7> <4i7sjtjkkwicppyo7qzxc5z2sww7jismue33ialoorkcn42edq@be3pts47rrao> In-Reply-To: <4i7sjtjkkwicppyo7qzxc5z2sww7jismue33ialoorkcn42edq@be3pts47rrao> From: Ken Matsui Date: Thu, 11 Jan 2024 04:22:19 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Backporting [was Re: [PATCH v2 1/2] libstdc++: Fix error handling in filesystem::equivalent [PR113250]] To: Jonathan Wakely Cc: gcc Patches , "libstdc++" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: ca_GQKB7ki3QYAc86IsuZrIjwzXMYJkh X-Proofpoint-ORIG-GUID: ca_GQKB7ki3QYAc86IsuZrIjwzXMYJkh X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-01-11_06,2024-01-11_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 phishscore=0 mlxlogscore=999 clxscore=1034 lowpriorityscore=0 priorityscore=1501 impostorscore=0 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000 definitions=main-2401110099 X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NEUTRAL,TXREP,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Thu, Jan 11, 2024 at 3:45=E2=80=AFAM Ken Matsui wrote: > > On Thu, 11 Jan 2024 at 11:14, Jonathan Wakely wrote: > > On Thu, 11 Jan 2024 at 10:56, Ken Matsui wrote: > > > > > > On Thu, 11 Jan 2024 at 10:46, Jonathan Wakely wr= ote: > > > > On Thu, 11 Jan 2024 at 09:43, Ken Matsui wrot= e: > > > > > > > > > > This patch made std::filesystem::equivalent correctly throw an ex= ception > > > > > when either path does not exist as per [fs.op.equivalent]/4. > > > > > > > > Thanks, OK for trunk and all active branches (let me know if you ne= ed > > > > help backporting it). > > > > > > > > > > Thank you for your review as always! I do not know how to backport t= his > > > to the active branches. I think the following page is explaining it, > > > but I am not sure how I can know all the active branches. > > > > > > https://gcc.gnu.org/wiki/GitCookbook#backport > > > > Supported releases are listed on the front page at gcc.gnu.org, the > > active branches are currently releases/gcc-11, releases/gcc-12 and > > releases/gcc-13. > > > > > > > > Do we basically want to git checkout & gcc-backport for each branch > > > after this patch is committed to the trunk? > > > > Almost. I use gcc-backport for the newest release branch > > (releases/gcc-13) and then I just use 'git cherry-pick' to cherry-pick > > the gcc-13 commit onto gcc-12, and then cherry-pick the gcc-12 commit > > onto gcc-11. > > > > The reason for this is that there might be some changes needed on a > > branch, either to resolve conflicts, or because of other differences > > on the branch. e.g. when I did 'git gcc-backport 74a0dab18292be' to > > backport that to gcc-13 I had to remove the changes to > > include/bits/version.* and edit include/std/version instead (because > > we do feature test macros differently on trunk). > > > > If I then wanted to backport it to gcc-12 and I just did 'git > > gcc-backport 74a0dab18292be' again in the gcc-12 branch, I would have > > to resolve the same conflicts again. If I do 'git cherry-pick > > c5ef02e5629f8c' instead (using the hash of the commit on the gcc-13 > > branch) then it will apply cleanly to gcc-12, because I'm using the > > commit that already has the conflicts resolved. > > > > Then if I want to backport to gcc-11 as well, use cherry-pick with the > > hash from the gcc-12 branch. > > > > This way any fixes that were needed for branch N-1 will get backported > > to N-2 as well. Sometimes this doesn't matter, e.g. the trunk commit > > might apply cleanly to every branch. But sometimes the commit needs > > slightly more massaging to apply to each older branch, so doing it > > trunk->13 then 13->12 then 12->11 tends to work better. > > > > The reason I use cherry-pick after the first backport (instead of > > gcc-backport every time) is because I don't want a second "(cherry > > picked from commit ...)" line to be added to the commit message. > > That's added by gcc-backport (by using cherry-pick -x) but we only > > need to add it once to be able to track the provenance of the > > backport, to know which trunk patch was backported. > > > > If cherry picking a backport fails and creates a mess of conflicts and > > you just want to give up and start again, 'git cherry-pick --abort' > > will undo the changes and leave the working tree clean again. This > > works whether you use gcc-backport or cherry-pick (because > > gcc-backport just uses cherry-pick). > > > > Thank you for the detailed explanation! I think I was able to backport > the patch to the active branches. > For the Bugzilla issue, should I update the status to RESOLVED? Or does someone else handle this? Also, are there other things I should do about this issue? https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D113250 > -- > Ken Matsui