From users-return-27233-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Fri Jun 22 14:33:11 2018 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 [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 445E3180647 for ; Fri, 22 Jun 2018 14:33:11 +0200 (CEST) Received: (qmail 58804 invoked by uid 500); 22 Jun 2018 12:33:05 -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 58790 invoked by uid 99); 22 Jun 2018 12:33:04 -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; Fri, 22 Jun 2018 12:33:04 +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 2ED67C07D4 for ; Fri, 22 Jun 2018 12:33:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.111 X-Spam-Level: X-Spam-Status: No, score=-0.111 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, T_DKIMWL_WL_MED=-0.01] autolearn=disabled Authentication-Results: spamd4-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id JLJLzpQC6gSy for ; Fri, 22 Jun 2018 12:33:03 +0000 (UTC) Received: from mail-ua0-f175.google.com (mail-ua0-f175.google.com [209.85.217.175]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTPS id 8ED195F57E for ; Fri, 22 Jun 2018 12:33:02 +0000 (UTC) Received: by mail-ua0-f175.google.com with SMTP id 74-v6so4198396uav.1 for ; Fri, 22 Jun 2018 05:33:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=zafc3n1fvjUfVPdus5sZooQvUwiQwkgDdMUPpJzXE2c=; b=bLvsT4zCWcKTnapMeYSXAvXLTlrjnzdr4zqri/6kVqOmCcatKCUW8g+C8Zg+ZSibX9 Rlj3dgzVd760xgcPB6FFAC7qAwza/xBkwicH4mUO9pOl9/ecO115vRw2IY6VDIBwzKVK /tlTnG0x40cY2JvEn5GM6CDjqDusbHyIJuVM7hAqVcIAnQyMa/nHQZMDgrJ1MPUCTCR2 kdQAQKk7mtgJF8nQYBs2hw9NKASxvF4IRQ/rSLfaH6YxtVliLOAqiVp1AaJAh80nt9I/ kPdhsD2Mms950jhU0czyH383S9AdpB894qUvYvBnanKBxCOTdCI978PIvw6UFqy2ZxOf P5Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=zafc3n1fvjUfVPdus5sZooQvUwiQwkgDdMUPpJzXE2c=; b=MjD74E+u4rCaCKdL+RCWBsV5Viv1O+2iCz5TMsSW/rrw6tQhyjoUSOg9xxyI8/MynG 4V0HCA43PkA6X7bmFfy8w4YOQIRly6soNfYags6/K9AT2V28RudONu4QSOQYKmUTzY+K J2Atjwbr8XFhSN7Hn9QZI1uuti2iyKsVZE099f8f+DfIpPJ3fFdSmzeupd401RA0wXb6 7kRlnBGMsDV6aFwWIVnujKM7YmrdLqYzO4bQ2NtT5L1QYuKtE5HpWZIJ4cITeNpS39mO uUzGiV4TuSE3hTXLf5hQUn5Ea48JL+EBiJ1qukXV72hWF+gKMrJAvoAxt1bSZ43NCgcu mWIA== X-Gm-Message-State: APt69E1xohbVPXuSFWZo9Pyyng6qKVXiPCh8M+wO0CDg/716r5IQ0KOa Rvu7OknPMj48DJd03pUIuiX6z+TvQ1N/DjDuAyI= X-Google-Smtp-Source: AAOMgpf+zowYwV1tF3bm5NJrl6p7iKRr9yvlg+tjesA4L7tjJc1ODC3DTH+hb/HTXGS5w+Y5m4P0TG6dyYU9cP3zriE= X-Received: by 2002:ab0:555c:: with SMTP id u28-v6mr849648uaa.91.1529670781442; Fri, 22 Jun 2018 05:33:01 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a67:818f:0:0:0:0:0 with HTTP; Fri, 22 Jun 2018 05:32:40 -0700 (PDT) In-Reply-To: <1529664193.21895.7.camel@thorstenknbl1.mgm-edv.de> References: <1529664193.21895.7.camel@thorstenknbl1.mgm-edv.de> From: Johan Corveleyn Date: Fri, 22 Jun 2018 14:32:40 +0200 Message-ID: Subject: Re: Change svn:mergeinfo property on an old revision of the repository (history) which has an invalid syntax To: Torsten Krah Cc: "users@subversion.apache.org" Content-Type: text/plain; charset="UTF-8" On Fri, Jun 22, 2018 at 12:43 PM, Torsten Krah wrote: > Hi, > > unfortunately trying to svnsync a repository i discovered that there is > an invalid revision in the repository having a wrong svn:mergeinfo > property, instead of > > 1280-1282 it has 1282-1280 > > "Commit rejected because mergeinfo on '/branch' is syntactically > invalid" > > The client we're using t sync is version 1.9.7. The source server is > 1.6.17. > > What's the best way to fix only those broken revision? Is there some way > to fix this property in the history? Or is there some way to fix that on > the fly? Any suggestions welcome. I'm not sure how this would have happened (perhaps by manually editing / setting the mergeinfo property by the person who made that commit?). I don't have any experience with this kind of problem, but perhaps this tool could help you: https://github.com/jwiegley/svndumptool It has several features for manipulating / fixing svn dump files. -- Johan