Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1839F110EF for ; Thu, 11 Sep 2014 12:04:44 +0000 (UTC) Received: (qmail 32078 invoked by uid 500); 11 Sep 2014 12:04:43 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 32044 invoked by uid 500); 11 Sep 2014 12:04:43 -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 32033 invoked by uid 99); 11 Sep 2014 12:04:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2014 12:04:43 +0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: local policy) Received: from [213.182.0.52] (HELO mail-a.speedkom.net) (213.182.0.52) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Sep 2014 12:04:16 +0000 Received: from SERVER10.in.3s-software.com (pat-out.3s-software.com [213.182.7.179]) by mail-a.speedkom.net with ESMTP id s8BC3cl4032621 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Thu, 11 Sep 2014 14:03:38 +0200 Received: from SERVER10.in.3s-software.com ([192.168.100.4]) by SERVER10 ([192.168.100.4]) with mapi id 14.02.0387.000; Thu, 11 Sep 2014 14:03:38 +0200 From: Markus Schaber To: John Maher CC: Subversion help Subject: AW: Merge problem Thread-Topic: Merge problem Thread-Index: Ac/MXqaZzBnpYaIsRpyepuiQOLjzeQAhpF+w///p14CAAZdogP//2xRg Date: Thu, 11 Sep 2014 12:03:36 +0000 Message-ID: <727D8E16AE957149B447FE368139F2B539CB2DAE@SERVER10> References: <910250F21FAA2A4E8F72DD21EA78076609427A6F@VMJudi.corp.rotair.com> <20140910113228.GA9666@ted.stsp.name> <910250F21FAA2A4E8F72DD21EA78076609428EFF@VMJudi.corp.rotair.com> In-Reply-To: <910250F21FAA2A4E8F72DD21EA78076609428EFF@VMJudi.corp.rotair.com> Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [192.168.101.172] Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org SGksIEpvaG4sDQoNCkkgZ3Vlc3MgU3RlZmFucyBxdWVzdGlvbiBmb3IgbW9yZSBkZXRhaWxzIHdh cyBkaXJlY3RlZCB0byBBbmRyZWFzIGFuZCBoaXMgcmF0aGVyIHVuc3BlY2lmaWMgcmFudCwgbm90 IHRvIHlvdXIgZW1haWwuDQoNCkJlc3QgcmVnYXJkcw0KDQpNYXJrdXMgU2NoYWJlcg0KDQpDT0RF U1lTwq4gYSB0cmFkZW1hcmsgb2YgM1MtU21hcnQgU29mdHdhcmUgU29sdXRpb25zIEdtYkgNCg0K SW5zcGlyaW5nIEF1dG9tYXRpb24gU29sdXRpb25zDQoNCjNTLVNtYXJ0IFNvZnR3YXJlIFNvbHV0 aW9ucyBHbWJIDQpEaXBsLi1JbmYuIE1hcmt1cyBTY2hhYmVyIHwgUHJvZHVjdCBEZXZlbG9wbWVu dCBDb3JlIFRlY2hub2xvZ3kNCk1lbW1pbmdlciBTdHIuIDE1MSB8IDg3NDM5IEtlbXB0ZW4gfCBH ZXJtYW55DQpUZWwuICs0OS04MzEtNTQwMzEtOTc5IHwgRmF4ICs0OS04MzEtNTQwMzEtNTANCg0K RS1NYWlsOiBtLnNjaGFiZXJAY29kZXN5cy5jb20gfCBXZWI6IGh0dHA6Ly93d3cuY29kZXN5cy5j b20gfCBDT0RFU1lTIHN0b3JlOiBodHRwOi8vc3RvcmUuY29kZXN5cy5jb20NCkNPREVTWVMgZm9y dW06IGh0dHA6Ly9mb3J1bS5jb2Rlc3lzLmNvbQ0KDQpNYW5hZ2luZyBEaXJlY3RvcnM6IERpcGwu SW5mLiBEaWV0ZXIgSGVzcywgRGlwbC5JbmYuIE1hbmZyZWQgV2VybmVyIHwgVHJhZGUgcmVnaXN0 ZXI6IEtlbXB0ZW4gSFJCIDYxODYgfCBUYXggSUQgTm8uOiBERSAxNjcwMTQ5MTUNCg0KVGhpcyBl LW1haWwgbWF5IGNvbnRhaW4gY29uZmlkZW50aWFsIGFuZC9vciBwcml2aWxlZ2VkIGluZm9ybWF0 aW9uLiBJZiB5b3UgYXJlIG5vdCB0aGUgaW50ZW5kZWQgcmVjaXBpZW50IChvciBoYXZlIHJlY2Vp dmVkDQp0aGlzIGUtbWFpbCBpbiBlcnJvcikgcGxlYXNlIG5vdGlmeSB0aGUgc2VuZGVyIGltbWVk aWF0ZWx5IGFuZCBkZXN0cm95IHRoaXMgZS1tYWlsLiBBbnkgdW5hdXRob3Jpc2VkIGNvcHlpbmcs IGRpc2Nsb3N1cmUNCm9yIGRpc3RyaWJ1dGlvbiBvZiB0aGUgbWF0ZXJpYWwgaW4gdGhpcyBlLW1h aWwgaXMgc3RyaWN0bHkgZm9yYmlkZGVuLg0KDQo+IC0tLS0tVXJzcHLDvG5nbGljaGUgTmFjaHJp Y2h0LS0tLS0NCj4gVm9uOiBKb2huIE1haGVyIFttYWlsdG86Sm9obk1Acm90YWlyLmNvbV0NCj4g R2VzZW5kZXQ6IERvbm5lcnN0YWcsIDExLiBTZXB0ZW1iZXIgMjAxNCAxMzo1MQ0KPiBBbjogU3Rl ZmFuIFNwZXJsaW5nOyBBbmRyZWFzIFRzY2hhcm5lcg0KPiBDYzogU3VidmVyc2lvbiBoZWxwDQo+ IEJldHJlZmY6IFJFOiBNZXJnZSBwcm9ibGVtDQo+IA0KPiBJIHNlbnQgbG90cyBvZiBkZXRhaWxz LiAgSWYgeW91IGNhbid0IHNlZSB0aGVtIHRoZW4gcGVyaGFwcyBzb21ldGhpbmcgaXMNCj4gYnVn Z3kgd2l0aCB0aGUgaGVscCBzeXN0ZW0uICBUaGUgY29uZmxpY3RzIHdlcmUgZWl0aGVyICJsb2Nh bCBhZGQsIGluY29taW5nDQo+IGFkZCB1cG9uIG1lcmdlIiBvciAiIGxvY2FsIGRlbGV0ZSwgaW5j b21pbmcgZGVsZXRlIHVwb24gbWVyZ2UiDQo+IA0KPiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0t LQ0KPiBGcm9tOiBTdGVmYW4gU3BlcmxpbmcgW21haWx0bzpzdHNwQGVsZWdvLmRlXQ0KPiBTZW50 OiBXZWRuZXNkYXksIFNlcHRlbWJlciAxMCwgMjAxNCA3OjMyIEFNDQo+IFRvOiBBbmRyZWFzIFRz Y2hhcm5lcg0KPiBDYzogSm9obiBNYWhlcjsgU3VidmVyc2lvbiBoZWxwDQo+IFN1YmplY3Q6IFJl OiBNZXJnZSBwcm9ibGVtDQo+IA0KPiBPbiBXZWQsIFNlcCAxMCwgMjAxNCBhdCAxMDo1Njo0MkFN ICswMDAwLCBBbmRyZWFzIFRzY2hhcm5lciB3cm90ZToNCj4gPg0KPiA+IFtzbmlwXQ0KPiA+ID4g SnVzdCB3b25kZXJpbmcgaWYgYW55b25lIG1heSBoYXZlIGFuIGlkZWEgaG93IG15IHJlcG9zaXRv cnkgZ290IHNvDQo+ID4gPiBidWdnZXJlZCB1cC4gIEkgdHJpZWQgdG8gbWVyZ2UgYSBicmFuY2gg dG8gdGhlIHRydW5rIGFuZCByZWNlaXZlZCA0OQ0KPiA+ID4gY29uZmxpY3RzLiAgMiBhcmUgZmls ZXMgdGhhdCBkbyBub3QgbmVlZCB0byBiZSB0cmFja2VkIHNvIHRoYXQNCj4gPiA+IGxlYXZlcyA0 Ny4gIE91dCBvZiB0aGUgNDcgdGhlcmUgYXJlIHR3byBwcm9ibGVtcywgbG9jYWwgYWRkLA0KPiA+ ID4gaW5jb21pbmcgYWRkIHVwb24gbWVyZ2UgJiBsb2NhbCBkZWxldGUsIGluY29taW5nIGRlbGV0 ZSB1cG9uIG1lcmdlLg0KPiA+ID4gSSB3YXMgZG9pbmcgc29tZSBjb2RlIGNsZWFudXAgc28gaXQg aXMgcG9zc2libGUgSSBkZWxldGVkIHRoZSBmaWxlcw0KPiA+ID4gaW4gdHdvIGRpZmZlcmVudCBi cmFuY2hlcy4NCj4gPiA+ICBCdXQgSSBrbm93IGZvciBjZXJ0YWluIHRoYXQgSSBkaWQgbm90IGNy ZWF0ZSB0aGUgc2FtZSBmaWxlIHR3aWNlLg0KPiA+ID4gSSBkaWQgYSBkaWZmIG9uIHRoZSBmaXJz dCBvbmUgYW5kIGl0IGlzIGlkZW50aWNhbCBpbiBib3RoIGJyYW5jaGVzLA0KPiA+ID4gZWFzeSB0 byBmaXgsIGRpZmZpY3VsdCB0byBkZXRlcm1pbmUgaG93IHRoZSBjb25mbGljdCBjYW1lIGFib3V0 Lg0KPiA+ID4gVGhlIHNlY29uZCBmaWxlIGlzIGRpZmZlcmVudCwgSSBkZWxldGVkIGRvbWUgY29k ZSB0aGF0IGlzIG5vdCBuZWVkZWQNCj4gPiA+IGFueW1vcmUuICBNb3JlIHdvcmsgdG8gZml4Lg0K PiA+ID4gV2l0aCB0aGUgY29uZmxpY3QgaXQgY2F1c2VzIHRoZSBtZXJnZSB0byBmYWlsIHRodXMg bWFraW5nIHRoaXMgbXVjaA0KPiA+ID4gbW9yZSB0aW1lIGNvbnN1bWluZyB0byBmaXguICBUaGUg cXVlc3Rpb24gSSBoYXZlIGlzDQo+ID4NCj4gPiBJIGRvbid0IHdhbnQgdG8gb2ZmZW5kIGFueW9u ZSBoZXJlLCBidXQgc3VjaCBib2d1cyBtZXJnZSBjb25mbGljdHMgd2VyZSB0aGUNCj4gcmVhc29u IHdlIGNoYW5nZWQgdG8gZ2l0Lg0KPiANCj4gQXBwbGVzIGFuZCBvcmFuZ2VzLg0KPiANCj4gPg0K PiA+ID4gYW55b25lIGtub3cgd2hhdCBJIGNvdWxk4oCZdmUgZG9uZSB0byBjcmVhdGUgdGhlc2Ug ZmFsc2UgY29uZmxpY3RzPw0KPiA+ID4NCj4gPiBOb3QgdG8gbXkga25vd2xlZGdlLi4uDQo+IA0K PiBEaWQgeW91IGFzayBmb3IgaGVscCBvbiB0aGlzIGxpc3Qgd2hlbiB5b3UgZ290IHNpbWlsYXIg Y29uZmxpY3RzPw0KPiBBbnkgcG9pbnRlcnMgdG8gdGhyZWFkcyBJIGNvdWxkIHJlYWQ/DQo+IA0K PiBJJ20gZ2VudWlubHkgaW50ZXJlc3RlZCBpbiB3aGF0IGNvbmZsaWN0cyB5b3Ugd2VyZSBzZWVp bmcgYW5kIGhvdyB5b3UNCj4gYXR0ZW1wdGVkIHRvIHJlc29sdmUgdGhlbS4NCj4gQnV0IEkgbmVl ZCBkZXRhaWxzLCBoYW5kd2F2eSBzdGF0ZW1lbnRzIHdvbid0IGhlbHAgbWUuDQoNCg==