Return-Path: X-Original-To: apmail-subversion-dev-archive@minotaur.apache.org Delivered-To: apmail-subversion-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 63C7410AB0 for ; Tue, 4 Jun 2013 16:30:24 +0000 (UTC) Received: (qmail 91441 invoked by uid 500); 4 Jun 2013 16:30:24 -0000 Delivered-To: apmail-subversion-dev-archive@subversion.apache.org Received: (qmail 91362 invoked by uid 500); 4 Jun 2013 16:30:24 -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 91355 invoked by uid 99); 4 Jun 2013 16:30:23 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 16:30:23 +0000 X-ASF-Spam-Status: No, hits=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE X-Spam-Check-By: apache.org Received-SPF: error (nike.apache.org: local policy) Received: from [212.82.108.235] (HELO nm4.bt.bullet.mail.ird.yahoo.com) (212.82.108.235) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 16:30:15 +0000 Received: from [212.82.108.228] by nm4.bt.bullet.mail.ird.yahoo.com with NNFMP; 04 Jun 2013 16:29:34 -0000 Received: from [212.82.108.226] by tm1.bt.bullet.mail.ird.yahoo.com with NNFMP; 04 Jun 2013 16:29:34 -0000 Received: from [127.0.0.1] by omp1003.bt.mail.ird.yahoo.com with NNFMP; 04 Jun 2013 16:29:34 -0000 X-Yahoo-Newman-Property: ymail-3 X-Yahoo-Newman-Id: 254730.47252.bm@omp1003.bt.mail.ird.yahoo.com Received: (qmail 58427 invoked by uid 60001); 4 Jun 2013 16:29:33 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=btopenworld.com; s=s1024; t=1370363373; bh=JtO4PmZSH3XAvYSRv9ZkVMu6JetYpIiIB+L4gQmq2k4=; h=X-YMail-OSG:Received:X-Rocket-MIMEInfo:X-Mailer:References:Message-ID:Date:From:Reply-To:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=q4BlsjXBKFm5tqPYL5qeaXTBLScE10O/31j1M6GtVokLacmOMZZBu8EvRDLsCYueHP0H05F8gi8VQEPOUIy0Dx1RYlinzkQJ0xGeyGpyaAgIrWak3H7w2qZrFcJVwVVeqBz4SqVIbs4Fz/wq2yat59KCBpgS8BACHtA5FSIuKe4= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=btopenworld.com; h=X-YMail-OSG:Received:X-Rocket-MIMEInfo:X-Mailer:References:Message-ID:Date:From:Reply-To:Subject:To:Cc:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=THc/krpD4s5MYOIBd9gBG/tuuJMBaHEB62UtXo4x0PqmI7T74rYid5oRDOiYXVSdpPd0mopKZabo8vnekr10ETr6+Ts4o6qPOk3HCFf6QCATrp/M4msVQI0cTFofdHt1rMfB9OBWlqQxfGagroVj3VkgkAnPaNmXbWrXJpBChMY=; X-YMail-OSG: 1RWVlgsVM1ku7hVCIgguQA60.wv0Qw7EY3DV.fgOfhFluqf mP2hPH5tZYdFp8_7VwfZ2oFB4cwUN7e_QpjSbWa53thMgO6XBjFyNUQpX7GX fr8RocHyjK34l92TfwKS.LbKGfMy.x5HW1OxppByI9sYMnxzhymZDlT5xE6s 7vyjFoPWfSh0k_w4uLSk_2mjDgJ6ZdisEmQ7OT031SDxv3Gp1xuMXLD3sgER KLBnS5wUqQq498M8XIMzGCzbV.x27I6280hAspOt9hUBXUuT6QfXg_8Yppu4 STAD2i9krlaiXzouJOBqrVbMGQ2_btknRzDfaD6HT2CnJQoJ27kpy1t7N0We 3GZFfl0PzdUEG5UrfhMVPm4kqOzX6wdU3NB4ue8M0hfneK6q4cPcyW1ZgS.T UX8yUyGjQ5i6YnOAhE6b9SNx5kXBFcfKXX4kDlCwSF.rxznvVr3oCI96DLPU ILfsDzpSAuOE7C6I9JK0C.GtAKsXPyIQS.ypPCQ5iGURLZ7szXGSvTPcA6rU BOAY7Q8f7vnWduZPrgCdMXvFYwAk3QDf24Dpu7yAAzZ2JpezVPIFSgoz9_tj v40mQUCVBYA-- Received: from [69.165.234.70] by web186105.mail.ir2.yahoo.com via HTTP; Tue, 04 Jun 2013 17:29:33 BST X-Rocket-MIMEInfo: 002.001,SXZhbiBaaGFrb3Ygd3JvdGU6Cgo.IFRoZSBvbmx5IHByb2JsZW0gdGhhdCBjaGVja3MgZm9yIG1peGVkIHJldmlzaW9uIHdvcmtpbmcgY29weSBwZXJmb3JtZWQKPiBhdCB0aGUgbGFzdCBzdGFnZS4gQ29uc2lkZXJpbmcgdGhlIGZhY3QgdGhhdCB1c2VycyBnb3QgbWl4ZWQgcmV2aXNpb24KPiBhZnRlciBldmVyeSBjb21taXQgaXQncyB2ZXJ5IGFubm95aW5nIHRvIHdhaXQgd2hpbGUgc3ZuIG1lcmdlIGNvbnRhY3RzCj4gc2VydmVyLCBhc2tzIGZvciBtZXJnZSBpbmZvIGFuZCBldGMganVzdCB0byBzaG93IGUBMAEBAQE- X-Mailer: YahooMailWebService/0.8.145.547 References: Message-ID: <1370363373.58256.YahooMailNeo@web186105.mail.ir2.yahoo.com> Date: Tue, 4 Jun 2013 17:29:33 +0100 (BST) From: Julian Foad Reply-To: Julian Foad Subject: Re: Mixed revision working copy check when merging To: Ivan Zhakov Cc: Subversion Development In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Virus-Checked: Checked by ClamAV on apache.org Ivan Zhakov wrote:=0A=0A> The only problem that checks for mixed revision w= orking copy performed=0A> at the last stage. Considering the fact that user= s got mixed revision=0A> after every commit it's very annoying to wait whil= e svn merge contacts=0A> server, asks for merge info and etc just to show e= rror that you have=0A> mixed revision working copy. I changed this behavior= in r1488183 to=0A> check working copy as soon as possible.=0A> =0A> Change= is very simple. I think it should be merged before next RC=0A> otherwise S= ubversion 1.8.0 could get very bad perception from users.=0A=0AYou're basic= ally asking for people to approve the back-port proposal for r1488183.=A0 O= K, Philip and I have now done that.=A0 It's approved.=A0 Thanks for proddin= g.=0A=0A- Julian