Hi, it seem imerge extension is broken with last version (1.1.1) of mercurial. Here a little recipe to reproduce: ,---- | thierry@tux ~/labo/testing $ mkdir test1 | thierry@tux ~/labo/testing $ cd test1 | thierry@tux ~/labo/testing/test1 $ echo "This is a test" > toto.txt | thierry@tux ~/labo/testing/test1 $ hg init | thierry@tux ~/labo/testing/test1 $ hg add toto.txt | thierry@tux ~/labo/testing/test1 $ hg commit | Waiting for Emacs... | thierry@tux ~/labo/testing/test1 $ hg status | thierry@tux ~/labo/testing/test1 $ hg heads | changeset: 0:3d29aec2c753 | tag: tip | user: Thierry Volpiatto <thierry.volpiatto@gmail.com> | date: Tue Jan 06 18:57:34 2009 +0100 | summary: initial version | | thierry@tux ~/labo/testing/test1 $ cd .. | thierry@tux ~/labo/testing $ rm -rf test1 | thierry@tux ~/labo/testing $ mkdir test1 | thierry@tux ~/labo/testing $ cd test1 | thierry@tux ~/labo/testing/test1 $ echo "This is a test" > toto.txt | thierry@tux ~/labo/testing/test1 $ hg init | thierry@tux ~/labo/testing/test1 $ hg add toto.txt | thierry@tux ~/labo/testing/test1 $ hg commit -m "initial commit" | thierry@tux ~/labo/testing/test1 $ hg heads | changeset: 0:3540c1de0c05 | tag: tip | user: Thierry Volpiatto <thierry.volpiatto@gmail.com> | date: Tue Jan 06 19:00:08 2009 +0100 | summary: initial commit | | thierry@tux ~/labo/testing/test1 $ cd .. | thierry@tux ~/labo/testing $ hg clone test1 test2 | updating working directory | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | thierry@tux ~/labo/testing $ ls | test1 test2 | thierry@tux ~/labo/testing $ cd test2 | thierry@tux ~/labo/testing/test2 $ echo "a second line" >> toto.txt | thierry@tux ~/labo/testing/test2 $ hg commit -m "add a second line" | thierry@tux ~/labo/testing/test2 $ cd .. | thierry@tux ~/labo/testing $ cd test1 | thierry@tux ~/labo/testing/test1 $ echo "a second line but different" >> toto.txt | thierry@tux ~/labo/testing/test1 $ hg commit -m "add a second line different of those in test1" | thierry@tux ~/labo/testing/test1 $ cd .. | thierry@tux ~/labo/testing $ cd test2 | thierry@tux ~/labo/testing/test2 $ hg pull | pulling from /home/thierry/labo/testing/test1 | searching for changes | adding changesets | adding manifests | adding file changes | added 1 changesets with 1 changes to 1 files (+1 heads) | (run 'hg heads' to see heads, 'hg merge' to merge) | thierry@tux ~/labo/testing/test2 $ hg heads | changeset: 2:f248e1021731 | tag: tip | parent: 0:3540c1de0c05 | user: Thierry Volpiatto <thierry.volpiatto@gmail.com> | date: Tue Jan 06 19:04:36 2009 +0100 | summary: add a second line different of those in test1 | | changeset: 1:3f6159fd4918 | user: Thierry Volpiatto <thierry.volpiatto@gmail.com> | date: Tue Jan 06 19:03:16 2009 +0100 | summary: add a second line | | thierry@tux ~/labo/testing/test2 $ hg imerge -a | ** unknown exception encountered, details follow | ** report bug details to http://www.selenic.com/mercurial/bts | ** or mercurial@selenic.com | ** Mercurial Distributed SCM (version 1.1.1) | ** Extensions loaded: color, convert, gpg, mq, imerge | Traceback (most recent call last): | File "/usr/bin/hg", line 20, in <module> | mercurial.dispatch.run() | File "//usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 20, in run | sys.exit(dispatch(sys.argv[1:])) | File "//usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 29, in dispatch | return _runcatch(u, args) | File "//usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 45, in _runcatch | return _dispatch(ui, args) | File "//usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 367, in _dispatch | ret = _runcommand(ui, options, cmd, d) | File "//usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 416, in _runcommand | return checkargs() | File "//usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 376, in checkargs | return cmdfunc() | File "//usr/lib/python2.5/site-packages/mercurial/dispatch.py", line 361, in <lambda> | d = lambda: util.checksignature(func)(ui, *args, **cmdoptions) | File "//usr/lib/python2.5/site-packages/mercurial/util.py", line 715, in check | return func(*args, **kwargs) | File "//usr/lib/python2.5/site-packages/hgext/imerge.py", line 376, in imerge | im = Imerge(ui, repo) | File "//usr/lib/python2.5/site-packages/hgext/imerge.py", line 61, in __init__ | self.wctx = self.repo.workingctx() | File "//usr/lib/python2.5/site-packages/mercurial/localrepo.py", line 101, in __getattr__ | raise AttributeError(name) | AttributeError: workingctx `---- Portage 2.1.6.4 (default/linux/x86/2008.0/desktop, gcc-4.1.2, glibc-2.6.1-r0, 2.6.27.9 i686) ================================================================= System uname: Linux-2.6.27.9-i686-Genuine_Intel-R-_CPU_T2130_@_1.86GHz-with-glibc2.0 Timestamp of tree: Tue, 06 Jan 2009 06:45:02 +0000 app-shells/bash: 3.2_p39 dev-java/java-config: 1.3.7-r1, 2.1.6-r1 dev-lang/python: 2.5.2-r8 dev-util/cmake: 2.4.6-r1 sys-apps/baselayout: 2.0.0 sys-apps/openrc: 0.4.1-r1 sys-apps/sandbox: 1.2.18.1-r2 sys-devel/autoconf: 2.63 sys-devel/automake: 1.5, 1.8.5-r3, 1.9.6-r2, 1.10.2 sys-devel/binutils: 2.18-r3 sys-devel/gcc-config: 1.4.0-r4 sys-devel/libtool: 1.5.26 virtual/os-headers: 2.6.27-r2 ACCEPT_KEYWORDS="x86" CBUILD="i686-pc-linux-gnu" CFLAGS="-O3 -march=i686 -pipe" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/terminfo /etc/texmf/web2c /etc/udev/rules.d" CXXFLAGS="-O3 -march=i686 -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="distlocks fixpackages parallel-fetch protect-owned sandbox sfperms strict unmerge-orphans userfetch" GENTOO_MIRRORS="ftp://ftp.free.fr/mirrors/ftp.gentoo.org/ " LANG="fr_FR.UTF-8" LC_ALL="fr_FR.UTF-8" LDFLAGS="-Wl,-O1" LINGUAS="fr" MAKEOPTS="-j3" PKGDIR="/usr/portage/packages" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" PORTDIR_OVERLAY="/usr/portage/local/layman/emacs /usr/portage/local/layman/lisp" SYNC="rsync://rsync.europe.gentoo.org/gentoo-portage" USE="X a52 aac acl acpi aiglx alsa amr ao async bash-completion bbdb bcmath berkdb bluetooth branding bzip2 cairo cdaudio cddb cdparanoia cdr cdrom cdsound cgi chroot clamav cli colordiff cpudetection cracklib crypt css cups dbus dell dhcp divx dri dvb dvd dvdr dvdread eds emacs emboss enca encode esd evo exif fam fbcon ffmpeg firefox fontconfig fortran gdbm gif gimp gnuplot gnus gnutls gpg gpm grub gstreamer gtk hal hddtemp hpn http iconv id3tag imagemagick imlib ipv6 ipw3945 isdnlog jabber jack java javascript joystick jpeg lame laptop ldb leim libnotify logrotate lua lynxkeymap mad midi mikmod mime mjpeg mp3 mpd mpeg mplayer mudflap ncurses nethack network nls nptl nptlonly ogg ogg123 opengl openmp openssh openssl pam pcre pdf perl png pnm pop postproc ppds pppd preview-latex print procmail pymacs python qt3 qt3support qt4 quicktime readline realmedia reflection restrict-javascript sdl session slang sound sox spell spl ssl startup-notification subversion svg sysfs tcl tcpd tga tiff tk transcode truetype type1 unicode usb v4l v4l2 vcd vorbis wav webdav wifi win32codecs wma x86 xanim xface xft xml xorg xpm xulrunner xv xvid xvmc zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" ELIBC="glibc" INPUT_DEVICES="keyboard mouse synaptics" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="fr" USERLAND="GNU" VIDEO_CARDS="intel" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Please test 1.1.2.
Imerge not working better with 1.1.2. Merge seem to cause problem also.
Also: this bug seem related to this: http://www.selenic.com/mercurial/bts/issue1327
From mercurial 1.2 changelog: the imerge extension has been removed (obsoleted by the resolve command) I'm closing this bug as wontfix.
