From users-return-28879-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Thu Oct 22 14:31:46 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-ec2-va.apache.org (mxout1-ec2-va.apache.org [3.227.148.255]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id DD735180654 for ; Thu, 22 Oct 2020 16:31:45 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-ec2-va.apache.org (ASF Mail Server at mxout1-ec2-va.apache.org) with SMTP id 264BE460F7 for ; Thu, 22 Oct 2020 14:31:45 +0000 (UTC) Received: (qmail 52592 invoked by uid 500); 22 Oct 2020 14:31:44 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 52579 invoked by uid 99); 22 Oct 2020 14:31:44 -0000 Received: from spamproc1-he-fi.apache.org (HELO spamproc1-he-fi.apache.org) (95.217.134.168) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Oct 2020 14:31:44 +0000 Received: from localhost (localhost [127.0.0.1]) by spamproc1-he-fi.apache.org (ASF Mail Server at spamproc1-he-fi.apache.org) with ESMTP id 43F9DC0439 for ; Thu, 22 Oct 2020 14:31:43 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamproc1-he-fi.apache.org X-Spam-Flag: NO X-Spam-Score: -2.193 X-Spam-Level: X-Spam-Status: No, score=-2.193 tagged_above=-999 required=6.31 tests=[HTML_MESSAGE=0.2, KAM_DMARC_STATUS=0.01, NICE_REPLY_A=-2.403, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-he-de.apache.org ([116.203.227.195]) by localhost (spamproc1-he-fi.apache.org [95.217.134.168]) (amavisd-new, port 10024) with ESMTP id g45rFvYzag61 for ; Thu, 22 Oct 2020 14:31:42 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2001:a78:1:13:212:75:53:139; helo=cloudmx1.spxs.net; envelope-from=prvs=557e043fa=tg@freigmbh.de; receiver= Received: from cloudmx1.spxs.net (cloudmx1.spxs.net [IPv6:2001:a78:1:13:212:75:53:139]) by mx1-he-de.apache.org (ASF Mail Server at mx1-he-de.apache.org) with ESMTPS id 859CB7FB7F for ; Thu, 22 Oct 2020 14:31:42 +0000 (UTC) IronPort-SDR: lv6mOEeZpWRw48FGQlqp4vBiCASmHrJxM8YwypYXyhoc80d40LP6pOhkP4Jdc3iUslx1ol1tgu RlA7EJ3GbeZm1VaJyLMxL/SJmFKI82PAN8qQ+qT6/1K8klhrWns+rWtT8pZrz9SVr7bbJKCbPI mFoDXBZRdBiHWsRVDsrvG1i2OEBVKOpIbd8M6Qh6WzDxMUaQt81/bq62e2kMn50/rYQQg8PRQT q7Zmo+SdcZL+ZCwrkm055HkqAaeD//OkeUjyuUfwjahpBn4/aBRf7QGXW92/5mjcXsQXVJLQ/D jlI= X-IronPort-AV: E=Sophos;i="5.77,404,1596492000"; d="scan'208,217";a="19069128" Received: from milano.freigmbh.de ([212.211.212.176]) by cloudmx1.spxs.net with SMTP; 22 Oct 2020 16:31:36 +0200 Received: from [172.30.0.94] (unknown [172.30.0.94]) by milano.freigmbh.de (Postfix) with ESMTPSA id CA647BE62A0; Thu, 22 Oct 2020 16:31:35 +0200 (CEST) Subject: Re: How to revert trunk to an earlier revision? To: bo.berglund@gmail.com References: <2453pf1rk5knn17danoh3h3r6ha9hl7601@4ax.com> Cc: "users@subversion.apache.org" From: Thorsten Message-ID: <90ee54a8-af2c-0365-fb9f-dede414689ca@freigmbh.de> Date: Thu, 22 Oct 2020 16:31:34 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: <2453pf1rk5knn17danoh3h3r6ha9hl7601@4ax.com> Content-Type: multipart/alternative; boundary="------------0E52552BB16F32503ACB6FBB" This is a multi-part message in MIME format. --------------0E52552BB16F32503ACB6FBB Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hello, > When I look up svn revert it only talks about removing local edits, > but what about this: > > Working on trunk and committing a few changes, which later turns out > to be wrong. > Now I want to set trunk head to be at the revision where the edits > started out from. You can use a feature called reverse merge. First make sure your working copy has no pending changes. -> revert everything or check out a new copy If you want to go back to revision 497 use: |svn merge -r HEAD:497 .| you can now commit to " sort of reset" the server to the same code as in version 497, or make more edits before you commit. https://stackoverflow.com/questions/1930725/svn-reverse-merge --------------0E52552BB16F32503ACB6FBB Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: 7bit

Hello,

When I look up svn revert it only talks about removing local edits,
but what about this:

Working on trunk and committing a few changes, which later turns out
to be wrong.
Now I want to set trunk head to be at the revision where the edits
started out from.


You can use a feature called reverse merge.

First make sure your working copy has no pending changes. -> revert everything or check out a new copy

If you want to go back to revision 497 use:

svn merge -r HEAD:497 .

you can now commit to " sort of reset" the server to the same code as in version 497, or make more edits before you commit.

https://stackoverflow.com/questions/1930725/svn-reverse-merge

--------------0E52552BB16F32503ACB6FBB--