From users-return-27022-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Fri Apr 6 16:22:49 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 0D4C7180649 for ; Fri, 6 Apr 2018 16:22:48 +0200 (CEST) Received: (qmail 76138 invoked by uid 500); 6 Apr 2018 14:22:47 -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 76128 invoked by uid 99); 6 Apr 2018 14:22:47 -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, 06 Apr 2018 14:22:47 +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 82796C039D for ; Fri, 6 Apr 2018 14:22:46 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.199 X-Spam-Level: * X-Spam-Status: No, score=1.199 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=2, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd4-us-west.apache.org (amavisd-new); dkim=pass (1024-bit key) header.d=protonmail.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 j6ey7GGAITUb for ; Fri, 6 Apr 2018 14:22:44 +0000 (UTC) Received: from mail4.protonmail.ch (mail4.protonmail.ch [185.70.40.27]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTPS id 614FF5F19B for ; Fri, 6 Apr 2018 14:22:43 +0000 (UTC) Date: Fri, 06 Apr 2018 10:22:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=default; t=1523024556; bh=lTmSEvX/zmrfX+xEo3YAhCkdV/YLUO4MU3iPS318zBU=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References: Feedback-ID:From; b=pTNCj35vY9PKs1wIpSgeWZJ1gDSS9OvuDK3wPrhyk4RaF5O1tXzs97QpSH/wC+YER NlmL5+Fr9Mq8HjzKe0D+Cke+JBxVRoDyyTnsCKtFQoMlVNro0rTs/12rsqUXJMCXnG SRw+D15KB3N3A5TESHbe+YKJ18s0Rrgsqk1hZ9Qo= To: stsp@elego.de From: Kaptaan Cc: users@subversion.apache.org Reply-To: Kaptaan Subject: Re: svn capture conflict messages in svn merge dry-run or svn merge non-interactive mode. Message-ID: In-Reply-To: <20180406133803.GF38920@ted.stsp.name> References: <20180406133803.GF38920@ted.stsp.name> Feedback-ID: jblQXTsqI-K7i6V6Y3a3EH8jj8BUqLWU-fdCQu3OVUyRBX-xrP7GE7X--m1sDHX7Q7JUeq03vnX8ILNDeGt9Tw==:Ext:ProtonMail MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="b1_0c8b87a3812aa13601995e8c7a9d8ac9" This is a multi-part message in MIME format. --b1_0c8b87a3812aa13601995e8c7a9d8ac9 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: base64 VGhhbmtzIFN0ZWZhbi4KClRoZSBjb21tYW5kIGlzIHN2biBzdGF0dXMgOi0pCgpJIHdpbGwgc2Ny aXB0IHNvbWV0aGluZyBhcm91bmQgdGhpcyB0byBzaG93IHRnaXMgaW5mb3JtYXRpb24gYW5kIHJl dmVydC4KClRoYW5rcywKQW1pdCBLYXRla2FyLgoKU2VudCBmcm9tIFByb3Rvbk1haWwgbW9iaWxl CgotLS0tLS0tLSBPcmlnaW5hbCBNZXNzYWdlIC0tLS0tLS0tCk9uIEFwciA2LCAyMDE4LCA4OjM4 IEFNLCBTdGVmYW4gU3Blcmxpbmcgd3JvdGU6Cgo+IE9uIEZyaSwgQXByIDA2LCAyMDE4IGF0IDA5 OjE5OjQ2QU0gLTA0MDAsIEthcHRhYW4gd3JvdGU6Cj4+IEkgd291bGQgbGlrZSB0byBzZWUgdGhl IG1lc3NhZ2UgIj4gTG9jYWwgZmlsZSBvYnN0cnVjdGlvbiwgaW5jb21pbmcgZmlsZSBhZGQgdXBv biBtZXJnZSIgZHVyaW5nIHRoZSBkcnlydW4gb3B0aW9uLiBJcyB0aGVyZSBhbnl3YXkgd2UgY2Fu IGhhdmUgdGhlIHJlYXNvbiBvZiB0aGUgY29uZmxpY3Qgc2hvdyBpbiBhIGRyeS1ydW4gb3IgZXZl biBpbiB0aGUgYWN0dWFsIG1lcmdlIGluIHRoZSBub24taW50ZXJhY3RpdmUgbW9kZT8KPj4KPj4g T3IgYW55IG90aGVyIGNvbW1hbmQgdG8gYWNoaWV2ZSB0aGUgc2FtZSByZXN1bHQ/Cj4KPiBJZiB5 b3UgcnVuICdzdm4gaW5mbycgb24gYSBjb25mbGljdGVkIHBhdGggaXQgc2hvdWxkIHNob3cgdGhp cyBpbmZvcm1hdGlvbi4= --b1_0c8b87a3812aa13601995e8c7a9d8ac9 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: base64 VGhhbmtzIFN0ZWZhbi4gPGJyPjxicj5UaGUgY29tbWFuZCBpcyBzdm4gc3RhdHVzIDotKSA8YnI+ PGJyPkkgd2lsbCBzY3JpcHQgc29tZXRoaW5nIGFyb3VuZCB0aGlzIHRvIHNob3cgdGdpcyBpbmZv cm1hdGlvbiBhbmQgcmV2ZXJ0LiA8YnI+PGJyPlRoYW5rcyw8YnI+QW1pdCBLYXRla2FyLiA8YnI+ PGJyPlNlbnQgZnJvbSBQcm90b25NYWlsIG1vYmlsZTxicj48YnI+PGJyPjxicj4tLS0tLS0tLSBP cmlnaW5hbCBNZXNzYWdlIC0tLS0tLS0tPGJyPk9uIEFwciA2LCAyMDE4LCA4OjM4IEFNLCBTdGVm YW4gU3BlcmxpbmcgPCBzdHNwQGVsZWdvLmRlPiB3cm90ZTo8YmxvY2txdW90ZSBjbGFzcz0icHJv dG9ubWFpbF9xdW90ZSI+PGJyPjxodG1sPjxoZWFkPjwvaGVhZD48Ym9keT5PbiBGcmksIEFwciAw NiwgMjAxOCBhdCAwOToxOTo0NkFNIC0wNDAwLCBLYXB0YWFuIHdyb3RlOjxicj4mZ3Q7IEkgd291 bGQgbGlrZSB0byBzZWUgdGhlIG1lc3NhZ2UgIiZndDsgTG9jYWwgZmlsZSBvYnN0cnVjdGlvbiwg aW5jb21pbmcgZmlsZSBhZGQgdXBvbiBtZXJnZSIgZHVyaW5nIHRoZSBkcnlydW4gb3B0aW9uLiBJ cyB0aGVyZSBhbnl3YXkgd2UgY2FuIGhhdmUgdGhlIHJlYXNvbiBvZiB0aGUgY29uZmxpY3Qgc2hv dyBpbiBhIGRyeS1ydW4gb3IgZXZlbiBpbiB0aGUgYWN0dWFsIG1lcmdlIGluIHRoZSBub24taW50 ZXJhY3RpdmUgbW9kZT88YnI+Jmd0OyA8YnI+Jmd0OyBPciBhbnkgb3RoZXIgY29tbWFuZCB0byBh Y2hpZXZlIHRoZSBzYW1lIHJlc3VsdD88YnI+PGJyPklmIHlvdSBydW4gJ3N2biBpbmZvJyBvbiBh IGNvbmZsaWN0ZWQgcGF0aCBpdCBzaG91bGQgc2hvdyB0aGlzIGluZm9ybWF0aW9uLjxicj48L2Jv ZHk+PC9odG1sPjwvZGl2Pg== --b1_0c8b87a3812aa13601995e8c7a9d8ac9--