From dev-return-39568-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Mon Oct 14 20:09:34 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id F0367180648 for ; Mon, 14 Oct 2019 22:09:33 +0200 (CEST) Received: (qmail 9076 invoked by uid 500); 14 Oct 2019 20:09:33 -0000 Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@subversion.apache.org Received: (qmail 9065 invoked by uid 99); 14 Oct 2019 20:09:33 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 14 Oct 2019 20:09:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 5027EC2D8D for ; Mon, 14 Oct 2019 20:09:32 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 5.6 X-Spam-Level: ***** X-Spam-Status: No, score=5.6 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, KAM_ASCII_DIVIDERS=0.8, KAM_FILE=4.5, KAM_NUMSUBJECT=0.5, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd4-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-he-de.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id EZkJ66OSAILG for ; Mon, 14 Oct 2019 20:09:29 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::332; helo=mail-ot1-x332.google.com; envelope-from=hartman.nathan@gmail.com; receiver= Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by mx1-he-de.apache.org (ASF Mail Server at mx1-he-de.apache.org) with ESMTPS id 102B77F5CE for ; Mon, 14 Oct 2019 20:09:28 +0000 (UTC) Received: by mail-ot1-x332.google.com with SMTP id 60so14888241otu.0 for ; Mon, 14 Oct 2019 13:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=gwFq9Tg1iJD1W1yMhrbPt1fzrvUylH8u9bfIHA+NzfU=; b=UgEH+oJJPYHlcshUHh7dh/Q69DU7OL1+s/jwnCKZ1OjT8X1KWq0SVCFi1K0JUCToVa bTfaBGcUxw6lNv8NFWRu3Fh2S9/4cT7bfzqLel4e/Uw2OGAxcHQA5jA9piLjo4tYlugW x+DJiHI9fqowd1RApMbjua268fV3ZrM2lszvnkwdXKqBj11E1P1lTCGmxX0g9xFhVrcU tsCTLqTfIiAeGV0Ap2WS/LZgaYBVQoySM1QqGRRrE1WZaEjm0d+ueEF8HIQDq8qrNTPK rKUBJALzYNWJp9EPzDXI9VKqLpaPFuYha/HzELMxL6VbHw9nUojWhOJlJV9osHY7vDgX 3aGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=gwFq9Tg1iJD1W1yMhrbPt1fzrvUylH8u9bfIHA+NzfU=; b=uWULswBzWG7abgF3/tl3JvELeruzceLOJbrJzc6EFgbzqpuyih/Bm4fLUbJ74un1lO 2y7EI2g1NHVscyxknh+3JcinWTJvzTOncS2jLGvBsBK0X7D646JcYFJ+nF7GxqDXovzE BG0aqMFG2siGQ0mgZa01YlORsAUObCN+UQHQvgYAAB9oOBuFDIJ02b1KZEHzs4GUbMPw +j+qD4EkUv919N13TxUMrQPgL8Q6mAKpmMBKAkuqb4PDy82XVk8n/B0oTCp54933WKLB cvCNL74RVKHpuAwJe5HnT8cYCwNddlM8mmkdxG0ZAgpuiAwmJN8uXh1SgRQogznT/mhe dO2Q== X-Gm-Message-State: APjAAAWBqpI2NOpWHymS9sO+LOamIcLIlaFjePlg4Xn9/6SDsJDOUvcg qxEh+d+wpaXgjEECAk7T81ZbHnE7zOXg5kXSA8tTniZ0 X-Google-Smtp-Source: APXvYqx8yu/GaayYh/YXXwywk1XLmb29KQG3vikvYR3lMqJmgMYlPWVkRfvBnl6g61ZTbj3neSBB5gCkpQ+bn9/cbg0= X-Received: by 2002:a9d:6d11:: with SMTP id o17mr22476114otp.333.1571083759992; Mon, 14 Oct 2019 13:09:19 -0700 (PDT) MIME-Version: 1.0 References: <49ddad98-c55e-4255-9aeb-245a54cc75af@www.fastmail.com> <2f9bc052-7077-417c-8622-d3b33185873d@www.fastmail.com> <655b06bd-b339-1479-aeac-76511bbedf7b@apache.org> In-Reply-To: <655b06bd-b339-1479-aeac-76511bbedf7b@apache.org> From: Nathan Hartman Date: Mon, 14 Oct 2019 16:09:07 -0400 Message-ID: Subject: Issue tracker housecleaning: SVN-1722 To: Subversion Developers Content-Type: text/plain; charset="UTF-8" A short time ago, in a galaxy nearby... or, in the thread "Fwd: PMCs: any Hackathon requests? (deadline 11 October)"... Julian Foad wrote: >> Nathan Hartman wrote: >> https://issues.apache.org/jira/browse/SVN-1722 "svn >> diff may missreport a revision as the working copy." > > Errm... last reviewed 9 years ago. Is it really what it says it is? > > Sadly, we have hundreds of unreviewed (or not recently reviewed) open > issues. Some are misleadingly labeled "bite-sized" but are really > symptoms of deeper problems. Can we take this opportunity to do > something about that? Like, maybe start bringing one old issue to the > dev list for review each week? I later said I would bring one issue to the list for review each week. So here's the first one... SVN-1722 is as good a candidate as any. Summary: I think this issue should be closed. It looks as though this issue was fixed somewhere between 1.8.19 and 1.12.2. I think the issue tracker was not updated because the fix might have occurred as part of other refactorings or new features in the code. In 2004, when the issue was opened, it was reported that the problem manifest when svn diff was run with the following arguments in the reproduction script: + svn diff -r BASE:HEAD + svn diff -r HEAD:BASE + svn diff -r HEAD + svn diff -r 0:HEAD + svn diff -r 1 Later, in 2010, C. Michael Pilato commented in the issue tracker and showed one form that was fixed and another that that was still broken. The correct form was output by: + svn diff -r BASE:HEAD The broken form was still being output by: + svn diff -r HEAD:BASE I ran the reproduction script against 1.8.19 and against 1.12.2 (respectively the oldest and newest installed versions I happen to have at the moment): When run against 1.8.19, the following forms produce the broken output: + svn diff -r HEAD:BASE + svn diff -r HEAD + svn diff -r 1 When run against 1.12.2, all of the forms appear correct. I did not setup and run a bisect to find the exact commit where the issue gets fixed, but some manual investigation turned up this very promising-looking candidate: r1570053 and these slightly less-promising-looking ones: r1619452 r1570266 The reproduction script (copied from issue tracker): $ cat runtest rm -rf repo test test2 svnadmin create repo svn checkout file:///`pwd`/repo test svn checkout file:///`pwd`/repo test2 cd test echo "test" >file svn add file svn -m test commit cd ../test2 svn diff -r BASE:HEAD svn diff -r HEAD:BASE svn diff -r BASE svn diff -r HEAD svn diff -r 0:BASE svn diff -r 0:HEAD svn diff -r 0:1 svn diff -r 1:0 svn diff -r 0 svn diff -r 1 Following is the output when run against 1.8.19; note the incorrect "working copy" labels when -r is HEAD:BASE, HEAD, and 1: $ sh -x runtest + rm -rf repo test test2 + svnadmin create repo ++ pwd + svn checkout file:////Users/nate/mount/ramdrive/test/repo test Checked out revision 0. ++ pwd + svn checkout file:////Users/nate/mount/ramdrive/test/repo test2 Checked out revision 0. + cd test + echo test + svn add file A file + svn -m test commit Adding file Transmitting file data . Committed revision 1. + cd ../test2 + svn diff -r BASE:HEAD Index: file =================================================================== --- file (revision 0) +++ file (revision 1) @@ -0,0 +1 @@ +test + svn diff -r HEAD:BASE Index: file =================================================================== --- file (revision 1) +++ file (working copy) @@ -1 +0,0 @@ -test + svn diff -r BASE + svn diff -r HEAD Index: file =================================================================== --- file (revision 1) +++ file (working copy) @@ -1 +0,0 @@ -test + svn diff -r 0:BASE + svn diff -r 0:HEAD Index: file =================================================================== --- file (revision 0) +++ file (revision 1) @@ -0,0 +1 @@ +test + svn diff -r 0:1 Index: file =================================================================== --- file (revision 0) +++ file (revision 1) @@ -0,0 +1 @@ +test + svn diff -r 1:0 Index: file =================================================================== --- file (revision 1) +++ file (revision 0) @@ -1 +0,0 @@ -test + svn diff -r 0 + svn diff -r 1 Index: file =================================================================== --- file (revision 1) +++ file (working copy) @@ -1 +0,0 @@ -test $ Following is the output when run against 1.12.2: $ sh -x runtest + rm -rf repo test test2 + svnadmin create repo + pwd + svn checkout file:////home/nate/ramdrive/test/repo test Checked out revision 0. + pwd + svn checkout file:////home/nate/ramdrive/test/repo test2 Checked out revision 0. + cd test + echo test + svn add file A file + svn -m test commit Adding file Transmitting file data .done Committing transaction... Committed revision 1. + cd ../test2 + svn diff -r BASE:HEAD Index: file =================================================================== --- file (nonexistent) +++ file (revision 1) @@ -0,0 +1 @@ +test + svn diff -r HEAD:BASE Index: file =================================================================== --- file (revision 1) +++ file (nonexistent) @@ -1 +0,0 @@ -test + svn diff -r BASE + svn diff -r HEAD Index: file =================================================================== --- file (revision 1) +++ file (nonexistent) @@ -1 +0,0 @@ -test + svn diff -r 0:BASE + svn diff -r 0:HEAD Index: file =================================================================== --- file (nonexistent) +++ file (revision 1) @@ -0,0 +1 @@ +test + svn diff -r 0:1 Index: file =================================================================== --- file (nonexistent) +++ file (revision 1) @@ -0,0 +1 @@ +test + svn diff -r 1:0 Index: file =================================================================== --- file (revision 1) +++ file (nonexistent) @@ -1 +0,0 @@ -test + svn diff -r 0 + svn diff -r 1 Index: file =================================================================== --- file (revision 1) +++ file (nonexistent) @@ -1 +0,0 @@ -test $ Thoughts? Nathan