From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 12 18:20:03 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7DC6B16A468 for ; Thu, 12 Jul 2007 18:20:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 59C7D13C4B7 for ; Thu, 12 Jul 2007 18:20:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l6CIK3nM081277 for ; Thu, 12 Jul 2007 18:20:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l6CIK22l081276; Thu, 12 Jul 2007 18:20:02 GMT (envelope-from gnats) Resent-Date: Thu, 12 Jul 2007 18:20:02 GMT Resent-Message-Id: <200707121820.l6CIK22l081276@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Michael P. Soulier" Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 90D2816A400 for ; Thu, 12 Jul 2007 18:17:44 +0000 (UTC) (envelope-from msoulier@digitaltorque.ca) Received: from mail.storm.ca (mail.storm.ca [209.87.239.66]) by mx1.freebsd.org (Postfix) with ESMTP id 55FF413C48A for ; Thu, 12 Jul 2007 18:17:44 +0000 (UTC) (envelope-from msoulier@digitaltorque.ca) Received: from kanga.digitaltorque.ca (hs-216-106-102-70.storm.ca [216.106.102.70]) by mail.storm.ca (8.14.0+Sun/8.14.0) with ESMTP id l6CHHFKe023372 for ; Thu, 12 Jul 2007 13:17:21 -0400 (EDT) Received: from kanga.digitaltorque.ca (localhost.digitaltorque.ca [127.0.0.1]) by kanga.digitaltorque.ca (Postfix) with ESMTP id 1ED2F5D for ; Thu, 12 Jul 2007 12:51:41 -0400 (EDT) Received: (from msoulier@localhost) by kanga.digitaltorque.ca (8.13.8/8.13.8/Submit) id l6CGpevS020384; Thu, 12 Jul 2007 12:51:40 -0400 (EDT) (envelope-from msoulier) Message-Id: <200707121651.l6CGpevS020384@kanga.digitaltorque.ca> Date: Thu, 12 Jul 2007 12:51:40 -0400 (EDT) From: "Michael P. Soulier" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/114533: mercurial port's hgmerge is broken X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: "Michael P. Soulier" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Jul 2007 18:20:03 -0000 >Number: 114533 >Category: ports >Synopsis: mercurial port's hgmerge is broken >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Jul 12 18:20:02 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Michael P. Soulier >Release: FreeBSD 5.5-STABLE i386 >Organization: >Environment: System: FreeBSD kanga.digitaltorque.ca 5.5-STABLE FreeBSD 5.5-STABLE #0: Fri Mar 23 18:01:20 EDT 2007 root@kanga.digitaltorque.ca:/usr/obj/usr/src/sys/GENERIC i386 AMD Duron >Description: I performed an "hg pull" followed by an "hg up" to pull in the latest changes from the head repository. I had modified local files but not yet checked them in. hg ran a merge, and that's when I saw this. /usr/local/bin/hgmerge: /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge: not found The merge failed, leaving my repository in an inconsistent state, and I had to recover manually. >How-To-Repeat: Something like this should work. cd $code_directory hg init hg add * hg ci -m "initial" cd .. hg clone $code_directory mybranch edit code in $code_directory, and ci the code cd mybranch edit files here but do not check in hg pull hg up >Fix: might want to pull in contrib/simplemerge as the default merge. >Release-Note: >Audit-Trail: >Unformatted: