Date: Thu, 12 Jul 2007 12:51:40 -0400 (EDT) From: "Michael P. Soulier" <msoulier@digitaltorque.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/114533: mercurial port's hgmerge is broken Message-ID: <200707121651.l6CGpevS020384@kanga.digitaltorque.ca> Resent-Message-ID: <200707121820.l6CIK22l081276@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707121651.l6CGpevS020384>