From sacadmin Thu Apr 3 13:56:06 2008 Received: from zruty.sfbay.sun.com (zruty.SFBay.Sun.COM [129.146.168.40]) by sac.sfbay.sun.com (8.13.8+Sun/8.13.8) with ESMTP id m33Ku6PE002138; Thu, 3 Apr 2008 13:56:06 -0700 (PDT) Received: from zruty.sfbay.sun.com (localhost [127.0.0.1]) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2) with ESMTP id m33Ku698019007; Thu, 3 Apr 2008 13:56:06 -0700 (PDT) Received: (from dduvall@localhost) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2/Submit) id m33Ku5jl019003; Thu, 3 Apr 2008 13:56:06 -0700 (PDT) Date: Thu, 3 Apr 2008 13:56:06 -0700 (PDT) From: Danek Duvall Message-Id: <200804032056.m33Ku5jl019003@zruty.sfbay.sun.com> To: PSARC-record@sac.sfbay.sun.com Subject: hgmerge(1) removal [PSARC/2008/238 FastTrack timeout 04/10/2008] Status: RO Content-Length: 553 Template Version: @(#)sac_nextcase 1.64 07/13/07 SMI This information is Copyright 2008 Sun Microsystems 1. Introduction 1.1. Project/Component Working Name: hgmerge(1) removal 1.2. Name of Document Author/Supplier: Author: Danek Duvall 1.3 Date of This Document: 03 April, 2008 4. Technical Description See the case directory for more detail 6. Resources and Schedule 6.4. Steering Committee requested information 6.4.1. Consolidation C-team Name: SFW 6.5. ARC review type: FastTrack 6.6. ARC Exposure: open From danek.duvall@sun.com Fri Apr 4 10:20:47 2008 Received: from sunmail5.uk.sun.com (sunmail5.UK.Sun.COM [129.156.85.165]) by sac.sfbay.sun.com (8.13.8+Sun/8.13.8) with ESMTP id m34HKkCI002894 for ; Fri, 4 Apr 2008 10:20:46 -0700 (PDT) Received: from nwk-avmta-2.sfbay.sun.com (nwk-avmta-2.SFBay.Sun.COM [129.145.155.6]) by sunmail5.uk.sun.com (8.13.8+Sun/8.13.8/ENSMAIL,v2.2) with ESMTP id m34HKX2r004807 for <@sunmail2sca.sfbay.sun.com:psarc-ext@sun.com>; Fri, 4 Apr 2008 18:20:45 +0100 (BST) Received: from pmxchannel-daemon.nwk-avmta-2.sfbay.sun.com by nwk-avmta-2.sfbay.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) id <0JYT00J0F9IJ4I00@nwk-avmta-2.sfbay.sun.com> for psarc-ext@sun.com (ORCPT psarc-ext@sun.com); Fri, 04 Apr 2008 10:20:43 -0700 (PDT) Received: from dm-sfbay-01.sfbay.sun.com ([129.145.155.118]) by nwk-avmta-2.sfbay.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) with ESMTP id <0JYT00EUD9IJ1EA0@nwk-avmta-2.sfbay.sun.com> for psarc-ext@sun.com (ORCPT psarc-ext@sun.com); Fri, 04 Apr 2008 10:20:43 -0700 (PDT) Received: from zruty.sfbay.sun.com (zruty.SFBay.Sun.COM [129.146.168.40]) by dm-sfbay-01.sfbay.sun.com (8.13.8+Sun/8.13.8/ENSMAIL,v2.2) with ESMTP id m34HKhad021681; Fri, 04 Apr 2008 10:20:43 -0700 (PDT) Received: from zruty.sfbay.sun.com (localhost [127.0.0.1]) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2) with ESMTP id m34HKgF6024294; Fri, 04 Apr 2008 10:20:42 -0700 (PDT) Received: (from dduvall@localhost) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2/Submit) id m34HKgTo024293; Fri, 04 Apr 2008 10:20:42 -0700 (PDT) Date: Fri, 04 Apr 2008 10:20:42 -0700 From: Danek Duvall Subject: hgmerge(1) removal [PSARC/2008/238 FastTrack timeout 04/10/2008] To: psarc-ext@sun.com Cc: richlowe@richlowe.net Message-id: <20080404172042.GA24283@zruty.sfbay.sun.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7BIT Content-disposition: inline X-PMX-Version: 5.4.1.325704 User-Agent: Mutt/1.5.16 (2007-06-27) Status: RO Content-Length: 1920 I'm sponsoring this case for myself; the release binding is Minor. As part of "Mercurial integration" (PSARC/2006/417), hgmerge(1) was documented as Committed. This project specifies the removal of that utility. No version of Solaris has shipped yet with that interface, and the project team asserts that the change is non-controversial. This utility was essentially a configuration file masquerading as a shell script. It contained a list of three-way merge tools and attempted to execute them, in an order of preference hard-coded into the script, until one was successful. Shortly before the release of mercurial 1.0 hgmerge(1) was removed from the distribution, because the core mercurial code acquired basic three-way merge functionality (a la RCS merge or diff3) in addition to a new configuration section for external merge programs. These two additions obviated the need for hgmerge(1). Given that the only three-way merge utility listed in hgmerge(1) which currently ships with Solaris is diff3, it's unlikely that many users on Solaris derived any benefit from its being there. They are much more likely to have configured a specific external merge program (such as one being developed in-house as a replacement for filemerge(1), gpyfm(1)); that configuration will continue to work. For those that had installed meld, kdiff3, tkdiff, or one of the others listed in hgmerge(1), and had no merge-specific mercurial configuration, they will have to tweak their configuration (~/.hgrc) to tell mercurial to invoke the utility of their choice. The project team will make announcements on all the appropriate aliases. In addition, although hgmerge(1) could be used as a standalone utility, it was likely rarely used as such. The project team doesn't feel that the class of users who might have used hgmerge(1) standalone is of a significant enough size to keep the utility around on that basis. Danek From Darren.Moffat@sun.com Fri Apr 4 11:40:06 2008 Received: from sunmail5.uk.sun.com (sunmail5.UK.Sun.COM [129.156.85.165]) by sac.sfbay.sun.com (8.13.8+Sun/8.13.8) with ESMTP id m34Ie5rm004618 for ; Fri, 4 Apr 2008 11:40:06 -0700 (PDT) Received: from nwk-avmta-2.sfbay.sun.com (nwk-avmta-2.SFBay.Sun.COM [129.145.155.6]) by sunmail5.uk.sun.com (8.13.8+Sun/8.13.8/ENSMAIL,v2.2) with ESMTP id m34Ie2pX005794 for <@sunmail2sca.sfbay.sun.com:psarc-ext@sun.com>; Fri, 4 Apr 2008 19:40:04 +0100 (BST) Received: from pmxchannel-daemon.nwk-avmta-2.sfbay.sun.com by nwk-avmta-2.sfbay.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) id <0JYT00M13D6Q4X00@nwk-avmta-2.sfbay.sun.com> for psarc-ext@sun.com (ORCPT psarc-ext@Sun.COM); Fri, 04 Apr 2008 11:40:02 -0700 (PDT) Received: from gmp-eb-inf-2.sun.com ([192.18.6.24]) by nwk-avmta-2.sfbay.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) with ESMTP id <0JYT00LAWD6CZG00@nwk-avmta-2.sfbay.sun.com> for psarc-ext@sun.com (ORCPT psarc-ext@Sun.COM); Fri, 04 Apr 2008 11:40:02 -0700 (PDT) Received: from fe-emea-09.sun.com (gmp-eb-lb-2-fe1.eu.sun.com [192.18.6.10]) by gmp-eb-inf-2.sun.com (8.13.7+Sun/8.12.9) with ESMTP id m34Idm7i028418 for ; Fri, 04 Apr 2008 18:39:48 +0000 (GMT) Received: from conversion-daemon.fe-emea-09.sun.com by fe-emea-09.sun.com (Sun Java System Messaging Server 6.2-8.04 (built Feb 28 2007)) id <0JYT00G01D5W3T00@fe-emea-09.sun.com> (original mail from Darren.Moffat@Sun.COM) for psarc-ext@Sun.COM (ORCPT psarc-ext@Sun.COM); Fri, 04 Apr 2008 19:39:48 +0100 (BST) Received: from [129.156.173.199] by fe-emea-09.sun.com (Sun Java System Messaging Server 6.2-8.04 (built Feb 28 2007)) with ESMTPSA id <0JYT001P6D6B7C10@fe-emea-09.sun.com>; Fri, 04 Apr 2008 19:39:48 +0100 (BST) Date: Fri, 04 Apr 2008 19:39:47 +0100 From: Darren J Moffat Subject: Re: hgmerge(1) removal [PSARC/2008/238 FastTrack timeout 04/10/2008] In-reply-to: <20080404172042.GA24283@zruty.sfbay.sun.com> Sender: Darren.Moffat@sun.com To: Danek Duvall Cc: psarc-ext@sun.com, richlowe@richlowe.net Message-id: <47F675F3.9030500@Sun.COM> MIME-version: 1.0 Content-type: text/plain; format=flowed; charset=ISO-8859-1 Content-transfer-encoding: 7BIT X-PMX-Version: 5.4.1.325704 References: <20080404172042.GA24283@zruty.sfbay.sun.com> User-Agent: Thunderbird 2.0.0.9 (X11/20080225) Status: RO Content-Length: 1592 Danek Duvall wrote: > I'm sponsoring this case for myself; the release binding is Minor. > > > As part of "Mercurial integration" (PSARC/2006/417), hgmerge(1) was > documented as Committed. > > This project specifies the removal of that utility. No version of Solaris > has shipped yet with that interface, and the project team asserts that the > change is non-controversial. > > This utility was essentially a configuration file masquerading as a shell > script. It contained a list of three-way merge tools and attempted to > execute them, in an order of preference hard-coded into the script, until > one was successful. > > Shortly before the release of mercurial 1.0 hgmerge(1) was removed from the > distribution, because the core mercurial code acquired basic three-way > merge functionality (a la RCS merge or diff3) in addition to a new > configuration section for external merge programs. These two additions > obviated the need for hgmerge(1). I have no issue with the removal per say. Even though I personally do use hgmerge - though I use a modified version of it in ~/bin/hgmerge (modified to run twmerge or gpyfm). However I'm confused as to why this is being done as a standalone case rather than as part of a case that introduces Mercurial 1.0 ? Is this basically the only visible interface change in 1.0 or is it that this is best done prior to the case that introduces the later version of Mercurial. Either way this case can proceed as is, I'd just like to know so of the sync issues since I'm a heavy mercurial user at the moment. -- Darren J Moffat From danek.duvall@sun.com Fri Apr 4 12:04:00 2008 Received: from sunmail2sca.sfbay.sun.com (sunmail2sca.SFBay.Sun.COM [129.145.155.234]) by sac.sfbay.sun.com (8.13.8+Sun/8.13.8) with ESMTP id m34J40U3005526 for ; Fri, 4 Apr 2008 12:04:00 -0700 (PDT) Received: from brm-avmta-1.central.sun.com (brm-avmta-1.Central.Sun.COM [129.147.4.11]) by sunmail2sca.sfbay.sun.com (8.13.7+Sun/8.13.7/ENSMAIL,v2.2) with ESMTP id m34J3xWI026633 for <@sunmail2sca.sfbay.sun.com:psarc-ext@Sun.COM>; Fri, 4 Apr 2008 12:03:59 -0700 (PDT) Received: from pmxchannel-daemon.brm-avmta-1.central.sun.com by brm-avmta-1.central.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) id <0JYT00C0DEAMBT00@brm-avmta-1.central.sun.com> for psarc-ext@Sun.COM (ORCPT psarc-ext@Sun.COM); Fri, 04 Apr 2008 13:03:58 -0600 (MDT) Received: from dm-sfbay-02.sfbay.sun.com ([129.146.11.31]) by brm-avmta-1.central.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) with ESMTP id <0JYT00A6VEAKVM10@brm-avmta-1.central.sun.com> for psarc-ext@Sun.COM (ORCPT psarc-ext@Sun.COM); Fri, 04 Apr 2008 13:03:56 -0600 (MDT) Received: from zruty.sfbay.sun.com (zruty.SFBay.Sun.COM [129.146.168.40]) by dm-sfbay-02.sfbay.sun.com (8.13.8+Sun/8.13.8/ENSMAIL,v2.2) with ESMTP id m34J3tvm049909; Fri, 04 Apr 2008 12:03:55 -0700 (PDT) Received: from zruty.sfbay.sun.com (localhost [127.0.0.1]) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2) with ESMTP id m34J3sfW025106; Fri, 04 Apr 2008 12:03:55 -0700 (PDT) Received: (from dduvall@localhost) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2/Submit) id m34J3sVU025105; Fri, 04 Apr 2008 12:03:54 -0700 (PDT) Date: Fri, 04 Apr 2008 12:03:54 -0700 From: Danek Duvall Subject: Re: hgmerge(1) removal [PSARC/2008/238 FastTrack timeout 04/10/2008] In-reply-to: <47F675F3.9030500@Sun.COM> To: Darren J Moffat Cc: psarc-ext@sun.com, richlowe@richlowe.net Message-id: <20080404190354.GP21079@zruty.sfbay.sun.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7BIT Content-disposition: inline X-PMX-Version: 5.4.1.325704 References: <20080404172042.GA24283@zruty.sfbay.sun.com> <47F675F3.9030500@Sun.COM> User-Agent: Mutt/1.5.16 (2007-06-27) Status: RO Content-Length: 787 On Fri, Apr 04, 2008 at 07:39:47PM +0100, Darren J Moffat wrote: > I have no issue with the removal per say. Even though I personally do use > hgmerge - though I use a modified version of it in ~/bin/hgmerge (modified > to run twmerge or gpyfm). That'll continue to work, actually. Mercurial will still fall back to hgmerge if it's found in your path. > However I'm confused as to why this is being done as a standalone case > rather than as part of a case that introduces Mercurial 1.0 ? Mostly because the changes introduced are below the level that the ARC is interested in. I know of no other incompatible change, and the rest of the change includes new modules (which wasn't something I'd exported in the original case), and a few new options to existing commands. Danek From Darren.Moffat@sun.com Fri Apr 4 12:14:47 2008 Received: from sunmail4.singapore.sun.com (sunmail4.Singapore.Sun.COM [129.158.71.19]) by sac.sfbay.sun.com (8.13.8+Sun/8.13.8) with ESMTP id m34JEkBH006457 for ; Fri, 4 Apr 2008 12:14:46 -0700 (PDT) Received: from nwk-avmta-1.SFBay.Sun.COM (nwk-avmta-1.SFBay.Sun.COM [129.146.11.74]) by sunmail4.singapore.sun.com (8.13.4+Sun/8.13.3/ENSMAIL,v2.2) with ESMTP id m34JEhHd016161 for <@sunmail2sca.sfbay.sun.com:psarc-ext@sun.com>; Sat, 5 Apr 2008 03:14:45 +0800 (SGT) Received: from pmxchannel-daemon.nwk-avmta-1.sfbay.Sun.COM by nwk-avmta-1.sfbay.Sun.COM (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) id <0JYT00801ESKAU00@nwk-avmta-1.sfbay.Sun.COM> for psarc-ext@sun.com (ORCPT psarc-ext@Sun.COM); Fri, 04 Apr 2008 12:14:44 -0700 (PDT) Received: from gmp-eb-inf-1.sun.com ([192.18.6.21]) by nwk-avmta-1.sfbay.Sun.COM (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) with ESMTP id <0JYT00M3LESJBFC0@nwk-avmta-1.sfbay.Sun.COM> for psarc-ext@sun.com (ORCPT psarc-ext@Sun.COM); Fri, 04 Apr 2008 12:14:44 -0700 (PDT) Received: from fe-emea-09.sun.com (gmp-eb-lb-2-fe2.eu.sun.com [192.18.6.11]) by gmp-eb-inf-1.sun.com (8.13.7+Sun/8.12.9) with ESMTP id m34JEhas028372 for ; Fri, 04 Apr 2008 19:14:43 +0000 (GMT) Received: from conversion-daemon.fe-emea-09.sun.com by fe-emea-09.sun.com (Sun Java System Messaging Server 6.2-8.04 (built Feb 28 2007)) id <0JYT00901ERKJX00@fe-emea-09.sun.com> (original mail from Darren.Moffat@Sun.COM) for psarc-ext@Sun.COM (ORCPT psarc-ext@Sun.COM); Fri, 04 Apr 2008 20:14:43 +0100 (BST) Received: from [129.156.173.199] by fe-emea-09.sun.com (Sun Java System Messaging Server 6.2-8.04 (built Feb 28 2007)) with ESMTPSA id <0JYT001QDESI7C10@fe-emea-09.sun.com>; Fri, 04 Apr 2008 20:14:43 +0100 (BST) Date: Fri, 04 Apr 2008 20:14:42 +0100 From: Darren J Moffat Subject: Re: hgmerge(1) removal [PSARC/2008/238 FastTrack timeout 04/10/2008] In-reply-to: <20080404190354.GP21079@zruty.sfbay.sun.com> Sender: Darren.Moffat@sun.com To: Danek Duvall Cc: psarc-ext@sun.com, richlowe@richlowe.net Message-id: <47F67E22.6070703@Sun.COM> MIME-version: 1.0 Content-type: text/plain; format=flowed; charset=ISO-8859-1 Content-transfer-encoding: 7BIT X-PMX-Version: 5.4.1.325704 References: <20080404172042.GA24283@zruty.sfbay.sun.com> <47F675F3.9030500@Sun.COM> <20080404190354.GP21079@zruty.sfbay.sun.com> User-Agent: Thunderbird 2.0.0.9 (X11/20080225) Status: RO Content-Length: 900 Danek Duvall wrote: > On Fri, Apr 04, 2008 at 07:39:47PM +0100, Darren J Moffat wrote: > >> I have no issue with the removal per say. Even though I personally do use >> hgmerge - though I use a modified version of it in ~/bin/hgmerge (modified >> to run twmerge or gpyfm). > > That'll continue to work, actually. Mercurial will still fall back to > hgmerge if it's found in your path. > >> However I'm confused as to why this is being done as a standalone case >> rather than as part of a case that introduces Mercurial 1.0 ? > > Mostly because the changes introduced are below the level that the ARC is > interested in. I know of no other incompatible change, and the rest of the > change includes new modules (which wasn't something I'd exported in the > original case), and a few new options to existing commands. That is what I expected. Super, roll on hg 1.0 !! -- Darren J Moffat From sommerfeld@sun.com Fri Apr 4 12:32:06 2008 Received: from newsunmail1brm.central.sun.com (newsunmail1brm.Central.Sun.COM [129.147.62.245]) by sac.sfbay.sun.com (8.13.8+Sun/8.13.8) with ESMTP id m34JW62q006648 for ; Fri, 4 Apr 2008 12:32:06 -0700 (PDT) Received: from brm-avmta-1.central.sun.com (brm-avmta-1.Central.Sun.COM [129.147.4.11]) by newsunmail1brm.central.sun.com (8.13.7+Sun/8.13.7/ENSMAIL,v2.2) with ESMTP id m34JW5Kp017152; Fri, 4 Apr 2008 13:32:05 -0600 (MDT) Received: from pmxchannel-daemon.brm-avmta-1.central.sun.com by brm-avmta-1.central.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) id <0JYT00E01FLHJ300@brm-avmta-1.central.sun.com>; Fri, 04 Apr 2008 13:32:05 -0600 (MDT) Received: from dm-east-01.east.sun.com ([129.148.9.192]) by brm-avmta-1.central.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) with ESMTP id <0JYT00AZ2FLGVK20@brm-avmta-1.central.sun.com>; Fri, 04 Apr 2008 13:32:05 -0600 (MDT) Received: from thunk.east.sun.com (thunk.East.Sun.COM [129.148.174.66]) by dm-east-01.east.sun.com (8.13.8+Sun/8.13.8/ENSMAIL,v2.2) with ESMTP id m34JVvQX016916; Fri, 04 Apr 2008 15:31:57 -0400 (EDT) Received: from [IPv6:::1] (localhost [IPv6:::1]) by thunk.east.sun.com (8.14.2+Sun/8.14.2) with ESMTP id m34JVteW015953; Fri, 04 Apr 2008 15:31:55 -0400 (EDT) Date: Fri, 04 Apr 2008 15:31:55 -0400 From: Bill Sommerfeld Subject: Re: hgmerge(1) removal [PSARC/2008/238 FastTrack timeout 04/10/2008] In-reply-to: <20080404190354.GP21079@zruty.sfbay.sun.com> To: Danek Duvall Cc: Darren J Moffat , psarc-ext@sun.com, richlowe@richlowe.net Message-id: <1207337515.15641.3.camel@thunk> MIME-version: 1.0 X-Mailer: Evolution 2.12.2 Content-type: text/plain Content-transfer-encoding: 7BIT X-PMX-Version: 5.4.1.325704 References: <20080404172042.GA24283@zruty.sfbay.sun.com> <47F675F3.9030500@Sun.COM> <20080404190354.GP21079@zruty.sfbay.sun.com> Status: RO Content-Length: 357 On Fri, 2008-04-04 at 12:03 -0700, Danek Duvall wrote: > I know of no other incompatible change, and the rest of the > change includes new modules (which wasn't something I'd exported in the > original case), and a few new options to existing commands. new options are often arc-worthy, especially if scripts would benefit from using them. - Bill From danek.duvall@sun.com Fri Apr 4 13:05:23 2008 Received: from sunmail4.singapore.sun.com (sunmail4.Singapore.Sun.COM [129.158.71.19]) by sac.sfbay.sun.com (8.13.8+Sun/8.13.8) with ESMTP id m34K5Me0007898 for ; Fri, 4 Apr 2008 13:05:22 -0700 (PDT) Received: from brm-avmta-1.central.sun.com (brm-avmta-1.Central.Sun.COM [129.147.4.11]) by sunmail4.singapore.sun.com (8.13.4+Sun/8.13.3/ENSMAIL,v2.2) with ESMTP id m34K4noV003615; Sat, 5 Apr 2008 04:05:20 +0800 (SGT) Received: from pmxchannel-daemon.brm-avmta-1.central.sun.com by brm-avmta-1.central.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) id <0JYT00H0JH4R2U00@brm-avmta-1.central.sun.com>; Fri, 04 Apr 2008 14:05:15 -0600 (MDT) Received: from dm-sfbay-01.sfbay.sun.com ([129.145.155.118]) by brm-avmta-1.central.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) with ESMTP id <0JYT00A6NH4QVM50@brm-avmta-1.central.sun.com>; Fri, 04 Apr 2008 14:05:14 -0600 (MDT) Received: from zruty.sfbay.sun.com (zruty.SFBay.Sun.COM [129.146.168.40]) by dm-sfbay-01.sfbay.sun.com (8.13.8+Sun/8.13.8/ENSMAIL,v2.2) with ESMTP id m34K5CTv063053; Fri, 04 Apr 2008 13:05:12 -0700 (PDT) Received: from zruty.sfbay.sun.com (localhost [127.0.0.1]) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2) with ESMTP id m34K5Cfq025573; Fri, 04 Apr 2008 13:05:12 -0700 (PDT) Received: (from dduvall@localhost) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2/Submit) id m34K5CUN025572; Fri, 04 Apr 2008 13:05:12 -0700 (PDT) Date: Fri, 04 Apr 2008 13:05:12 -0700 From: Danek Duvall Subject: Re: hgmerge(1) removal [PSARC/2008/238 FastTrack timeout 04/10/2008] In-reply-to: <1207337515.15641.3.camel@thunk> To: Bill Sommerfeld Cc: Darren J Moffat , psarc-ext@sun.com, richlowe@richlowe.net Message-id: <20080404200512.GT21079@zruty.sfbay.sun.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7BIT Content-disposition: inline X-PMX-Version: 5.4.1.325704 References: <20080404172042.GA24283@zruty.sfbay.sun.com> <47F675F3.9030500@Sun.COM> <20080404190354.GP21079@zruty.sfbay.sun.com> <1207337515.15641.3.camel@thunk> User-Agent: Mutt/1.5.16 (2007-06-27) Status: RO Content-Length: 329 On Fri, Apr 04, 2008 at 03:31:55PM -0400, Bill Sommerfeld wrote: > new options are often arc-worthy, especially if scripts would benefit > from using them. The original case plopped all the options under a single umbrella without enumerating them. I claim that the new ones follow suit, and also needn't be enumerated. Danek From jek3@sun.com Fri Apr 4 15:33:28 2008 Received: from sunmail4.singapore.sun.com (sunmail4.Singapore.Sun.COM [129.158.71.19]) by sac.sfbay.sun.com (8.13.8+Sun/8.13.8) with ESMTP id m34MXRrw011973 for ; Fri, 4 Apr 2008 15:33:28 -0700 (PDT) Received: from nwk-avmta-1.SFBay.Sun.COM (nwk-avmta-1.SFBay.Sun.COM [129.146.11.74]) by sunmail4.singapore.sun.com (8.13.4+Sun/8.13.3/ENSMAIL,v2.2) with ESMTP id m34MXKfv023928; Sat, 5 Apr 2008 06:33:23 +0800 (SGT) Received: from pmxchannel-daemon.nwk-avmta-1.sfbay.Sun.COM by nwk-avmta-1.sfbay.Sun.COM (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) id <0JYT0040XNZLLV00@nwk-avmta-1.sfbay.Sun.COM>; Fri, 04 Apr 2008 15:33:21 -0700 (PDT) Received: from jurassic-x4600.sfbay.sun.com ([129.146.17.63]) by nwk-avmta-1.sfbay.Sun.COM (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) with ESMTP id <0JYT00IHFNZHPN60@nwk-avmta-1.sfbay.Sun.COM>; Fri, 04 Apr 2008 15:33:17 -0700 (PDT) Received: from [129.150.13.200] (vpn-129-150-13-200.SFBay.Sun.COM [129.150.13.200]) by jurassic-x4600.sfbay.sun.com (8.14.2+Sun/8.14.2) with ESMTP id m34MXGic656477; Fri, 04 Apr 2008 15:33:16 -0700 (PDT) Date: Fri, 04 Apr 2008 12:33:13 -1000 From: Joseph Kowalski Subject: Re: hgmerge(1) removal [PSARC/2008/238 FastTrack timeout 04/10/2008] In-reply-to: <47F675F3.9030500@Sun.COM> To: Darren J Moffat Cc: Danek Duvall , psarc-ext@sun.com, richlowe@richlowe.net Message-id: <47F6ACA9.1070203@sun.com> MIME-version: 1.0 Content-type: text/plain; charset=ISO-8859-1; format=flowed Content-transfer-encoding: 7BIT X-PMX-Version: 5.4.1.325704 References: <20080404172042.GA24283@zruty.sfbay.sun.com> <47F675F3.9030500@Sun.COM> User-Agent: Thunderbird 2.0.0.9 (X11/20080225) Status: RO Content-Length: 674 Darren J Moffat wrote: > Either way this case can proceed as is, I'd just like to know so of > the sync issues since I'm a heavy mercurial user at the moment. As are most Sun JavaSE developers. Worse yet, these poor people are all hg novices (me too!) who will have trouble understanding any unexpected change. I can hardly wait to hear the reaction when one of these poor folk upgrades between Nevada releases and their scripts/expectations fail. Let's make sure this change is widely advertised. Of course, this is a good chance to bitch about how the old rules don't really work for Nevada. We've all had that discussion. Let's not have it again. :-) - jek3 From danek.duvall@sun.com Fri Apr 4 16:56:52 2008 Received: from sunmail5.uk.sun.com (sunmail5.UK.Sun.COM [129.156.85.165]) by sac.sfbay.sun.com (8.13.8+Sun/8.13.8) with ESMTP id m34NuprR014882 for ; Fri, 4 Apr 2008 16:56:52 -0700 (PDT) Received: from nwk-avmta-1.SFBay.Sun.COM (nwk-avmta-1.SFBay.Sun.COM [129.146.11.74]) by sunmail5.uk.sun.com (8.13.8+Sun/8.13.8/ENSMAIL,v2.2) with ESMTP id m34NumBQ029900; Sat, 5 Apr 2008 00:56:49 +0100 (BST) Received: from pmxchannel-daemon.nwk-avmta-1.sfbay.Sun.COM by nwk-avmta-1.sfbay.Sun.COM (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) id <0JYT00B01RUMM800@nwk-avmta-1.sfbay.Sun.COM>; Fri, 04 Apr 2008 16:56:46 -0700 (PDT) Received: from dm-sfbay-01.sfbay.sun.com ([129.145.155.118]) by nwk-avmta-1.sfbay.Sun.COM (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) with ESMTP id <0JYT00IIVRUMPOA0@nwk-avmta-1.sfbay.Sun.COM>; Fri, 04 Apr 2008 16:56:46 -0700 (PDT) Received: from zruty.sfbay.sun.com (zruty.SFBay.Sun.COM [129.146.168.40]) by dm-sfbay-01.sfbay.sun.com (8.13.8+Sun/8.13.8/ENSMAIL,v2.2) with ESMTP id m34NuiMv057587; Fri, 04 Apr 2008 16:56:44 -0700 (PDT) Received: from zruty.sfbay.sun.com (localhost [127.0.0.1]) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2) with ESMTP id m34NuhT0026766; Fri, 04 Apr 2008 16:56:43 -0700 (PDT) Received: (from dduvall@localhost) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2/Submit) id m34NuhDE026765; Fri, 04 Apr 2008 16:56:43 -0700 (PDT) Date: Fri, 04 Apr 2008 16:56:43 -0700 From: Danek Duvall Subject: Re: hgmerge(1) removal [PSARC/2008/238 FastTrack timeout 04/10/2008] In-reply-to: <47F6ACA9.1070203@sun.com> To: Joseph Kowalski Cc: Darren J Moffat , psarc-ext@sun.com, richlowe@richlowe.net Message-id: <20080404235643.GY21079@zruty.sfbay.sun.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7BIT Content-disposition: inline X-PMX-Version: 5.4.1.325704 References: <20080404172042.GA24283@zruty.sfbay.sun.com> <47F675F3.9030500@Sun.COM> <47F6ACA9.1070203@sun.com> User-Agent: Mutt/1.5.16 (2007-06-27) Status: RO Content-Length: 440 On Fri, Apr 04, 2008 at 12:33:13PM -1000, Joseph Kowalski wrote: > Let's make sure this change is widely advertised. Indeed. I don't expect anything that hasn't dug into undocumented API to fail, but if it does, I (and the hg developers) will want to hear about it. Please feel free to send me (privately) any lists you think need to be notified. I'm planning on opensolaris-announce and opensolaris-code, for starters. Thanks! Danek From danek.duvall@sun.com Wed Apr 9 13:29:28 2008 Received: from sunmail5.uk.sun.com (sunmail5.UK.Sun.COM [129.156.85.165]) by sac.sfbay.sun.com (8.13.8+Sun/8.13.8) with ESMTP id m39KTR0P001994 for ; Wed, 9 Apr 2008 13:29:28 -0700 (PDT) Received: from nwk-avmta-2.sfbay.sun.com (nwk-avmta-2.SFBay.Sun.COM [129.145.155.6]) by sunmail5.uk.sun.com (8.13.8+Sun/8.13.8/ENSMAIL,v2.2) with ESMTP id m39KTIK7014003 for <@sunmail2sca.sfbay.sun.com:psarc-ext@Sun.COM>; Wed, 9 Apr 2008 21:29:27 +0100 (BST) Received: from pmxchannel-daemon.nwk-avmta-2.sfbay.sun.com by nwk-avmta-2.sfbay.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) id <0JZ20001LRKZ8900@nwk-avmta-2.sfbay.sun.com> for psarc-ext@Sun.COM (ORCPT psarc-ext@Sun.COM); Wed, 09 Apr 2008 13:29:23 -0700 (PDT) Received: from dm-sfbay-02.sfbay.sun.com ([129.146.11.31]) by nwk-avmta-2.sfbay.sun.com (Sun Java System Messaging Server 6.2-3.04 (built Jul 15 2005)) with ESMTP id <0JZ200IJORKZE060@nwk-avmta-2.sfbay.sun.com> for psarc-ext@Sun.COM (ORCPT psarc-ext@Sun.COM); Wed, 09 Apr 2008 13:29:23 -0700 (PDT) Received: from zruty.sfbay.sun.com (zruty.SFBay.Sun.COM [129.146.168.40]) by dm-sfbay-02.sfbay.sun.com (8.13.8+Sun/8.13.8/ENSMAIL,v2.2) with ESMTP id m39KTMGj046796; Wed, 09 Apr 2008 13:29:22 -0700 (PDT) Received: from zruty.sfbay.sun.com (localhost [127.0.0.1]) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2) with ESMTP id m39KTLx6026771; Wed, 09 Apr 2008 13:29:22 -0700 (PDT) Received: (from dduvall@localhost) by zruty.sfbay.sun.com (8.14.2+Sun/8.14.2/Submit) id m39KT2mc026766; Wed, 09 Apr 2008 13:29:02 -0700 (PDT) Date: Wed, 09 Apr 2008 13:29:02 -0700 From: Danek Duvall Subject: Re: hgmerge(1) removal [PSARC/2008/238 FastTrack timeout 04/10/2008] In-reply-to: <20080404172042.GA24283@zruty.sfbay.sun.com> To: psarc-ext@sun.com Cc: richlowe@richlowe.net Message-id: <20080409202902.GP21079@zruty.sfbay.sun.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7BIT Content-disposition: inline X-PMX-Version: 5.4.1.325704 References: <20080404172042.GA24283@zruty.sfbay.sun.com> User-Agent: Mutt/1.5.16 (2007-06-27) Status: RO Content-Length: 46 This case was approved in PSARC today. Danek