a bug in "hg convert" with subversion sources?
Giorgos Keramidas
keramida at ceid.upatras.gr
Wed Feb 10 17:09:50 CST 2010
Hi Patrick,
I think I might have bumped on a bug of "convert" with a subversion
source. I am running a crew snapshot built from:
: changeset: 10408:50fb1fe143ff
: tag: tip
: user: Benoit Boissinot <benoit.boissinot at ens-lyon.org>
: date: Wed Feb 10 20:08:18 2010 +0100
: summary: url: httplib.HTTPSConnection already handles IPv6 and port parsing fine
with a few local changes (all of them unrelated to convert):
: keramida at kobe:/hg/mercurial/gker$ hg diff -r default hgext | diffstat -p1
: hgext/keyword.py | 2 -
: hgext/rechmod.py | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
: 2 files changed, 72 insertions(+), 1 deletion(-)
There's a mirror of the svn repository of FreeBSD at /home/svn/base
There's a converted 'head' branch of file:///home/svn/base/head that
includes all the branch commits since 2008-01-01, that passes a check
with "hg verify".
Subversion revision 203613 patches head/bin/pax/Makefile with a small
change.
The convert extension gets confused and thinks the file was entirely
removed!
: keramida at kobe:/hg/bsd/head$ export LANG=C
:
: keramida at kobe:/hg/bsd/head$ export LC_ALL=C
:
: keramida at kobe:/hg/bsd/head$ time hg --debug verify
: repository uses revlog format 1
: checking changesets
: checking manifests
: crosschecking files in changesets and manifests
: checking files
: 45935 files, 16172 changesets, 91197 total revisions
: 109.873 real 60.431 user 36.234 sys
The converted 'head' branch looks ok so far.
: keramida at kobe:/hg/bsd/head$ hg manifest tip | fgrep bin/pax/Makefile
: bin/pax/Makefile
:
: keramida at kobe:/hg/bsd/head$ hg tip
: changeset: 16171:b832f04fb580
: branch: head
: tag: tip
: user: ed
: date: Sun Feb 07 15:42:15 2010 +0000
: summary: Remove statistics from the TTY queues.
:
: keramida at kobe:/hg/bsd/head$ tail -1 .hg/shamap
: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203611 b832f04fb580603121279f2d102f09773f72d310
The .hg/shamap includes all the svn revisions up to 'tip'.
: keramida at kobe:/hg/bsd$ cat pull-head.sh
: #!/usr/bin/ksh -p
:
: set -e
: hg --debug convert \
: --config convert.svn.startrev='175021' \
: --config convert.svn.trunk='head' \
: --config convert.svn.branches='' \
: --config convert.svn.tags='' \
: file:///home/svn/base/ head
That's the shell script I am using to convert svn changesets.
A full log of the latest conversion run is...
: keramida at kobe:/hg/bsd$ time ./pull-head.sh
: reparent to file:///home/svn/base
: run hg sink pre-conversion action
: scanning source...
: found trunk at 'head'
: reparent to file:///home/svn/base/head
: fetching revision log for "/head" from 203764 to 203611
: parsing revision 203764 (3 changes)
: parsing revision 203763 (2 changes)
: parsing revision 203762 (1 changes)
: parsing revision 203761 (1 changes)
: parsing revision 203760 (1 changes)
: parsing revision 203759 (1 changes)
: parsing revision 203758 (38 changes)
: parsing revision 203757 (1 changes)
: parsing revision 203754 (1 changes)
: parsing revision 203752 (1 changes)
: parsing revision 203751 (1 changes)
: parsing revision 203750 (1 changes)
: parsing revision 203747 (1 changes)
: parsing revision 203746 (1 changes)
: parsing revision 203745 (1 changes)
: parsing revision 203744 (1 changes)
: parsing revision 203743 (1 changes)
: parsing revision 203735 (2 changes)
: parsing revision 203734 (1 changes)
: parsing revision 203733 (1 changes)
: parsing revision 203732 (6 changes)
: parsing revision 203731 (3 changes)
: parsing revision 203729 (1 changes)
: parsing revision 203728 (1 changes)
: parsing revision 203727 (1 changes)
: parsing revision 203724 (1 changes)
: parsing revision 203723 (3 changes)
: parsing revision 203722 (1 changes)
: parsing revision 203721 (1 changes)
: parsing revision 203719 (1 changes)
: parsing revision 203717 (1 changes)
: parsing revision 203716 (1 changes)
: parsing revision 203714 (1 changes)
: parsing revision 203713 (1 changes)
: parsing revision 203711 (2 changes)
: parsing revision 203710 (3 changes)
: parsing revision 203708 (1 changes)
: parsing revision 203707 (1 changes)
: parsing revision 203703 (1 changes)
: parsing revision 203699 (3 changes)
: parsing revision 203698 (1 changes)
: parsing revision 203697 (18 changes)
: parsing revision 203696 (3 changes)
: parsing revision 203695 (1 changes)
: parsing revision 203693 (3 changes)
: parsing revision 203692 (14 changes)
: parsing revision 203691 (4 changes)
: parsing revision 203690 (1 changes)
: parsing revision 203689 (4 changes)
: parsing revision 203688 (3 changes)
: parsing revision 203687 (8 changes)
: parsing revision 203686 (2 changes)
: parsing revision 203685 (2 changes)
: parsing revision 203684 (4 changes)
: parsing revision 203683 (2 changes)
: parsing revision 203682 (7 changes)
: parsing revision 203681 (1 changes)
: parsing revision 203680 (1 changes)
: parsing revision 203679 (5 changes)
: parsing revision 203678 (2 changes)
: parsing revision 203677 (1 changes)
: parsing revision 203676 (3 changes)
: parsing revision 203673 (1 changes)
: parsing revision 203665 (1 changes)
: parsing revision 203660 (5 changes)
: parsing revision 203659 (1 changes)
: parsing revision 203657 (1 changes)
: parsing revision 203637 (1 changes)
: parsing revision 203636 (1 changes)
: parsing revision 203629 (1 changes)
: parsing revision 203622 (2 changes)
: parsing revision 203621 (1 changes)
: parsing revision 203620 (2 changes)
: parsing revision 203618 (1 changes)
: parsing revision 203613 (3 changes)
: parsing revision 203611 (2 changes)
: reparent to file:///home/svn/base
: reparent to file:///home/svn/base/head
: sorting...
: converting...
: 74 Tell the compiler these structures are aligned to a byte boundary.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203613
: bin/pax/Makefile
: bin/pax/cpio.h
: bin/pax/tar.h
This revision should have _patched_ bin/pax/Makefile instead of removing it.
: 73 Spelling nit
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203618
: sys/kern/subr_bus.c
: 72 Document support for the D-Link DFE520-TX card (supported with the vr(4)
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203620
: share/man/man4/vr.4
: sys/conf/NOTES
: 71 Bump .Dd for r203620
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203621
: share/man/man4/vr.4
: 70 Add support for a few more Sony-specific ACPI features (default display
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203622
: share/man/man4/acpi_sony.4
: sys/dev/acpi_support/acpi_sony.c
: 69 merge from my tbemd branch: cmpdi2 and ucmpdi2 are genereated when the
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203629
: sys/conf/files.mips
: 68 Correct arguments to free_unr(), "item" was missing.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203636
: share/man/man9/alloc_unr.9
: 67 Improve checking whether an ARM VA has a valid mapping before performing cache
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203637
: sys/arm/arm/pmap.c
: 66 Set waiters flag before checking semaphore's counter,
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203657
: sys/kern/kern_umtx.c
: 65 Fall back to ASCII codepoints for box drawing.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203659
: sys/teken/teken_scs.h
: 64 Remove unused LIBCOMPAT keyword from syscalls.master.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203660
: sys/compat/freebsd32/syscalls.master
: sys/compat/svr4/syscalls.master
: sys/i386/ibcs2/syscalls.master
: sys/kern/makesyscalls.sh
: sys/kern/syscalls.master
: 63 Make sure that FTS_COMFOLLOW is not set when the -P option is in effect.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203665
: bin/ls/ls.c
: 62 Ensure that tkip_mixing_phase1() is called after a rekeying event when
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203673
: sys/net80211/ieee80211_crypto_tkip.c
: 61 Introduce new rc.conf variable firewall_coscripts. It can be used to
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203676
: etc/defaults/rc.conf
: etc/rc.d/ipfw
: share/man/man5/rc.conf.5
: 60 sh: Make sure the mail2.0 test can actually fail if $MAIL is not touched.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203677
: tools/regression/bin/sh/parameters/mail2.0
: 59 Rename usb2_ structures and variables to usb_.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203678
: sys/dev/sound/usb/uaudio.c
: sys/dev/sound/usb/uaudioreg.h
: 58 Remove the usb2_input_kbd directive that was missed during the renaming of the drivers in the usb2 stack.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203679
: sys/conf/files.amd64
: sys/conf/files.i386
: sys/conf/files.ia64
: sys/conf/files.pc98
: sys/conf/files.sparc64
: 57 Fix typo in comment.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203680
: sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
: 56 Fix typo and remove extra spaces.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203681
: share/man/man4/sctp.4
: 55 Fix TX power problems with AR9285.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203682
: sys/dev/ath/ath_hal/ah_eeprom_v14.h
: sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
: sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
: sys/dev/ath/ath_hal/ar5416/ar5416phy.h
: sys/dev/ath/ath_hal/ar5416/ar9280.c
: sys/dev/ath/ath_hal/ar5416/ar9280.h
: sys/dev/ath/ath_hal/ar5416/ar9280_attach.c
: 54 Add multicast key search support. This fixes corrupted mcast packets
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203683
: sys/dev/ath/if_ath.c
: sys/dev/ath/if_athvar.h
: 53 Update .Dt on these man pages: the kernel modules and corresponding man
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203684
: share/man/man4/io.4
: share/man/man4/linux.4
: share/man/man4/ndis.4
: share/man/man4/nvram.4
: 52 Document the usfs driver and the NO_SYSCTL_DESCR option, and update the comment for umass.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203685
: sys/conf/NOTES
: sys/dev/aic7xxx/aic79xx_osm.c
: 51 If there is only one NIC in the system that is up and running, the
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203686
: usr.sbin/wake/wake.8
: usr.sbin/wake/wake.c
: 50 Update .Dt to reflect the fact that these drivers and man pages are
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203687
: share/man/man4/acpi_asus.4
: share/man/man4/acpi_fujitsu.4
: share/man/man4/acpi_hp.4
: share/man/man4/acpi_ibm.4
: share/man/man4/acpi_panasonic.4
: share/man/man4/acpi_sony.4
: share/man/man4/acpi_toshiba.4
: share/man/man4/acpi_wmi.4
: 49 Initialize the execfile argument to NULL instead of _PATH_DEVNULL. This allows the -M option to be used without specifying -N.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203688
: bin/pkill/pkill.c
: bin/ps/ps.c
: usr.bin/w/w.c
: 48 Install the padlock(4) man page on amd64 as well as i386, to match the
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203689
: gone from -1
: entry /head/share/man/man4/man4.i386/padlock.4
: reparent to file:///home/svn/base
: reparent to file:///home/svn/base/head
: share/man/man4/Makefile
: share/man/man4/man4.i386/Makefile
: share/man/man4/man4.i386/padlock.4
: share/man/man4/padlock.4
: 47 Xorg isn't treated as a distribution, so /usr/X11R6/lib shouldn't be configured when running ldconfig.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203690
: usr.sbin/sysinstall/package.c
: 46 Update documentation for the iwn and iwnfw drivers: they support the 1000, 5150, 6000 and 6050 devices too, with firmware modules for the 4965, 1000, 5000, 5150 and 6000.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203691
: share/man/man4/iwn.4
: share/man/man4/iwnfw.4
: sys/amd64/conf/NOTES
: sys/i386/conf/NOTES
: 45 Kernel modules for these drivers are installed on all platforms, so
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203692
: gone from -1
: entry /head/share/man/man4/man4.i386/alpm.4
: reparent to file:///home/svn/base
: reparent to file:///home/svn/base/head
: gone from -1
: entry /head/share/man/man4/man4.i386/amdpm.4
: reparent to file:///home/svn/base
: reparent to file:///home/svn/base/head
: gone from -1
: entry /head/share/man/man4/man4.i386/mcd.4
: reparent to file:///home/svn/base
: reparent to file:///home/svn/base/head
: gone from -1
: entry /head/share/man/man4/man4.i386/pcf.4
: reparent to file:///home/svn/base
: reparent to file:///home/svn/base/head
: gone from -1
: entry /head/share/man/man4/man4.i386/scd.4
: reparent to file:///home/svn/base
: reparent to file:///home/svn/base/head
: gone from -1
: entry /head/share/man/man4/man4.i386/viapm.4
: reparent to file:///home/svn/base
: reparent to file:///home/svn/base/head
: share/man/man4/Makefile
: share/man/man4/alpm.4
: share/man/man4/amdpm.4
: share/man/man4/man4.i386/Makefile
: share/man/man4/man4.i386/alpm.4
: share/man/man4/man4.i386/amdpm.4
: share/man/man4/man4.i386/mcd.4
: share/man/man4/man4.i386/pcf.4
: share/man/man4/man4.i386/scd.4
: share/man/man4/man4.i386/viapm.4
: share/man/man4/mcd.4
: share/man/man4/pcf.4
: share/man/man4/scd.4
: share/man/man4/viapm.4
: 44 Disable the use of the IAAD usb doorbell on NVidia controllers as it can cause
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203693
: sys/dev/usb/controller/ehci.c
: sys/dev/usb/controller/ehci.h
: sys/dev/usb/controller/ehci_pci.c
: 43 Fixing compilation bustage by removing a stray comment fragment.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203695
: sys/dev/ath/if_ath.c
: 42 Add PT_VM_TIMESTAMP and PT_VM_ENTRY so that the tracing process can
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203696
: lib/libc/sys/ptrace.2
: sys/kern/sys_process.c
: sys/sys/ptrace.h
: 41 SMP support for the mips port.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203697
: sys/conf/files.mips
: sys/mips/conf/SWARM_SMP
: sys/mips/include/asm.h
: sys/mips/include/cpu.h
: sys/mips/include/hwfunc.h
: sys/mips/include/intr_machdep.h
: sys/mips/include/pcpu.h
: sys/mips/include/smp.h
: sys/mips/mips/intr_machdep.c
: sys/mips/mips/machdep.c
: sys/mips/mips/mp_machdep.c
: sys/mips/mips/mpboot.S
: sys/mips/mips/pmap.c
: sys/mips/sibyte/sb_asm.S
: sys/mips/sibyte/sb_machdep.c
: sys/mips/sibyte/sb_scd.c
: sys/mips/sibyte/sb_scd.h
: sys/mips/sibyte/sb_zbbus.c
: 40 Set ut_line to "ftpd" for ftpd.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203698
: libexec/ftpd/logwtmp.c
: 39 - pt_BR.ISO8859-1 catalog
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203699
: usr.bin/ee/Makefile
: usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg
: 38 Add the definition of Mistakeholder
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203703
: games/fortune/datfiles/fortunes
: 37 Anything that casts struct sockaddr * to struct sockaddr_foo is safe
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203707
: usr.sbin/wake/Makefile
: 36 Unbreak building kernels with COMPAT_32 enabled. The actual support
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203708
: sys/kern/sys_process.c
: 35 When you have multiple addresses on the same network on different
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203710
: usr.sbin/rpcbind/rpcbind.c
: usr.sbin/rpcbind/rpcbind.h
: usr.sbin/rpcbind/util.c
: 34 As it turns out, fmt(1) is being used by the base system as well as the
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203711
: tools/build/mk/OptionalObsoleteFiles.inc
: usr.bin/Makefile
: 33 Add description for libefi.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203713
: gnu/usr.bin/groff/tmac/mdoc.local
: 32 Various fixes like spelling, style and syntax.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203714
: lib/libefi/libefi.3
: 31 Move device specific flag configuration to attach routine.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203716
: sys/dev/bge/if_bge.c
: 30 Add -i to usage()
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203717
: sbin/sysctl/sysctl.c
: 29 - Deal with some special cases [1]
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203719
: lib/libc/nls/msgcat.c
: 28 Add references to VOP_* man pages to vnode(9).
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203721
: share/man/man9/vnode.9
: 27 Remove VOP_VPTOFH(9) from references in VFS(9), as it's a VOP,
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203722
: share/man/man9/VFS.9
: 26 Don't let find(1) depend on struct timeb.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203723
: usr.bin/find/extern.h
: usr.bin/find/function.c
: usr.bin/find/getdate.y
: 25 Properly free resources when destroying the TCP hostcache while
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203724
: sys/netinet/tcp_hostcache.c
: 24 Add an SDT provider for "vnet"s along with probes for vnet_alloc
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203727
: sys/net/vnet.c
: 23 - Return EAFNOSUPPORT instead of EINVAL for unsupported address family,
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203728
: sys/compat/linux/linux_socket.c
: 22 Add DDB support for printing vnet_sysinit and vnet_sysuninit
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203729
: sys/net/vnet.c
: 21 Some style(9) fixes
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203731
: sys/nfs/nfs_common.c
: sys/nfs/nfs_common.h
: sys/nfsclient/nfs_krpc.c
: 20 - Move nfs_realign() from the NFS client to the shared NFS code and
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203732
: sys/nfs/nfs_common.c
: sys/nfs/nfs_common.h
: sys/nfsclient/nfs_krpc.c
: sys/nfsserver/nfs.h
: sys/nfsserver/nfs_fha.c
: sys/nfsserver/nfs_srvkrpc.c
: 19 Symbolic link to mailwrapper should only be removed if both MK_MAILWRAPPER
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203733
: tools/build/mk/OptionalObsoleteFiles.inc
: 18 Fix PR
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203734
: lib/libc/stdlib/strfmon.c
: 17 Add new -o option (r203042) to manpage synopsis and usage().
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203735
: usr.bin/uname/uname.1
: usr.bin/uname/uname.c
: 16 Enable interrupts before doing AST processing to avoid a deadlock.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203743
: sys/mips/mips/exception.S
: 15 In function umtxq_insert_queue, use parameter q (shared/exclusive queue)
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203744
: sys/kern/kern_umtx.c
: 14 Call profclock() and statclock() explicitly on all cpus. Prior to this
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203745
: sys/mips/mips/tick.c
: 13 Code cleanup:
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203746
: sys/mips/mips/tick.c
: 12 Remove unneeded CFLAGS.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203747
: usr.bin/find/Makefile
: 11 't' stands for Turbo and is a valid mode, so fix previous commit.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203750
: sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
: 10 Fix typo in comment.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203751
: sys/dev/ath/if_ath.c
: 9 Turn on the front LED at boot time like we do with the Avila.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203752
: sys/arm/xscale/ixp425/cambria_fled.c
: 8 If a mbuf is split across two pages, we
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203754
: sys/mips/rmi/dev/xlr/rge.c
: 7 - Remove reference to nfs4. mount_nfs4(8) was removed in r192578.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203757
: sbin/mount/mount.8
: 6 Add the options DEADLKRES (introducing the deadlock resolver thread) in
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203758
: sys/amd64/conf/GENERIC
: sys/amd64/conf/XENHVM
: sys/arm/conf/AVILA
: sys/arm/conf/BWCT
: sys/arm/conf/CAMBRIA
: sys/arm/conf/CNS11XXNAS
: sys/arm/conf/CRB
: sys/arm/conf/DB-78XXX
: sys/arm/conf/DB-88F5XXX
: sys/arm/conf/DB-88F6XXX
: sys/arm/conf/EP80219
: sys/arm/conf/GUMSTIX
: sys/arm/conf/HL200
: sys/arm/conf/IQ31244
: sys/arm/conf/KB920X
: sys/arm/conf/NSLU
: sys/arm/conf/SIMICS
: sys/arm/conf/SKYEYE
: sys/i386/conf/GENERIC
: sys/i386/conf/XEN
: sys/ia64/conf/GENERIC
: sys/mips/conf/ADM5120
: sys/mips/conf/ALCHEMY
: sys/mips/conf/AR71XX
: sys/mips/conf/IDT
: sys/mips/conf/MALTA
: sys/mips/conf/MALTA64
: sys/mips/conf/OCTEON1
: sys/mips/conf/OCTEON1-32
: sys/mips/conf/QEMU
: sys/mips/conf/SENTRY5
: sys/mips/conf/SWARM
: sys/mips/conf/XLR
: sys/pc98/conf/GENERIC
: sys/powerpc/conf/GENERIC
: sys/powerpc/conf/MPC85XX
: sys/sparc64/conf/GENERIC
: sys/sun4v/conf/GENERIC
: 5 Improve description for Giant and mention blocking inside interrupt threads.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203759
: share/man/man9/locking.9
: 4 Improve time precision for grdc(6):
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203760
: games/grdc/grdc.c
: 3 Remove unused variable.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203761
: sys/ufs/ffs/ffs_vfsops.c
: 2 Start sentences with a new line.
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203762
: share/man/man9/locking.9
: 1 This fix corrects a problem in the file system that treats large
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203763
: sys/ufs/ffs/ffs_alloc.c
: sys/ufs/ffs/fs.h
: 0 Ensure that newfs will never create a filesystem with more than 2^32
: source: svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203764
: sbin/newfs/mkfs.c
: sbin/newfs/newfs.c
: sbin/newfs/newfs.h
: run hg sink post-conversion action
: 12.226 real 7.737 user 2.371 sys
: keramida at kobe:/hg/bsd$ svn diff -c 203613 file:///home/svn/base/head/bin/pax/Makefile
: Index: Makefile
: ===================================================================
: --- Makefile (revision 203612)
: +++ Makefile (revision 203613)
: @@ -33,6 +33,4 @@
: #MAN= pax.1 tar.1 cpio.1
: #LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
:
: -WARNS?= 3
: -
: .include <bsd.prog.mk>
This is the Makefile diff subversion contains for rev 203613.
: keramida at kobe:/hg/bsd/head$ hg log --removed --limit 2 bin/pax/Makefile
: changeset: 16172:9ac1b3d1b61a
: branch: head
: user: imp
: date: Sun Feb 07 17:05:22 2010 +0000
: summary: Tell the compiler these structures are aligned to a byte boundary.
:
: changeset: 16106:2dcbda61e5a3
: branch: head
: user: imp
: date: Thu Feb 04 07:18:19 2010 +0000
: summary: Arm doesn't seem to need such kit gloves. Bump the warnings to 3 here
hg convert has *deleted* the file in changeset 9ac1b3d1b61a.
: keramida at kobe:/hg/bsd/head$ hg log --debug -vr 9ac1b3d1b61a
: changeset: 16172:9ac1b3d1b61a6cd7182b49240d2873b5952f2d5d
: branch: head
: parent: 16171:b832f04fb580603121279f2d102f09773f72d310
: parent: -1:0000000000000000000000000000000000000000
: manifest: 16172:a569e6101c5d18a04ac3cec1157dc8484a82d2cc
: user: imp
: date: Sun Feb 07 17:05:22 2010 +0000
: files: bin/pax/cpio.h bin/pax/tar.h
: files-: bin/pax/Makefile
: extra: branch=head
: extra: convert_revision=svn:ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f/head at 203613
: description:
: Tell the compiler these structures are aligned to a byte boundary.
: All the elements of these structs are char anyway, so it won't hurt
: performance.
:
: Bump warns back up to the default.
:
: # we likely should have CTASSERTS to make sure they are the right size.
: # but with libarchive based tar maybe we shouldn't bother.
:
: keramida at kobe:/hg/bsd/head$ hg diff -c 9ac1b3d1b61a bin/pax/Makefile
: diff -r b832f04fb580 -r 9ac1b3d1b61a bin/pax/Makefile
: --- a/bin/pax/Makefile Sun Feb 07 15:42:15 2010 +0000
: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
: @@ -1,38 +0,0 @@
: -# @(#)Makefile 8.1 (Berkeley) 5/31/93
: -# $FreeBSD$
: -
: -# To install on versions prior to BSD 4.4 the following may have to be
: -# defined with CFLAGS +=
: [...]
This looks like a bug in the code that parses svn revision 203613, but I
am not sure what to make of it. The --xml output of svn log shows the
bin/pax/Makefile file as modified, not as removed:
: keramida at kobe:~$ svn log --xml -v -c 203613 file:///home/svn/base/head
: <?xml version="1.0"?>
: <log>
: <logentry
: revision="203613">
: <author>imp</author>
: <date>2010-02-07T17:05:22.679857Z</date>
: <paths>
: <path
: kind=""
: action="M">/head/bin/pax/cpio.h</path>
: <path
: kind=""
: action="M">/head/bin/pax/tar.h</path>
: <path
: kind=""
: action="M">/head/bin/pax/Makefile</path>
: </paths>
: ...
One important thing to note is that I do not have a workspace at all in
/hg/bsd/head. In fact the parent of the workspace is nullid:
: keramida at kobe:/hg/bsd/head$ hg --debug id
: 0000000000000000000000000000000000000000
:
: keramida at kobe:/hg/bsd/head$ ls -la
: total 6
: drwxr-xr-x 3 keramida users - 512 11 Φεβ 00:39 .
: drwxr-xr-x 5 keramida users - 512 11 Φεβ 00:44 ..
: drwxr-xr-x 4 keramida users - 512 11 Φεβ 00:46 .hg
:
: keramida at kobe:/hg/bsd/head$
If you need access to the .hg/shamap and /head/.hg files to debug this
or you want me to patch convert/subversion.py locally, please feel free
to ping me.
More information about the Mercurial-devel
mailing list