Author: Anthony Scarpino <Anthony.Scarpino at Sun.COM> Repository: /hg/zfs-crypto/gate Latest revision: 5c11f0c874f902f7a4aec79e03196101c7d9f5c3 Total changesets: 1 Log message: merge Files: delete: deleted_files/usr/src/pkgdefs/SUNWiwk/Makefile delete: deleted_files/usr/src/pkgdefs/SUNWiwk/pkginfo.tmpl delete: deleted_files/usr/src/pkgdefs/SUNWiwk/postinstall delete: deleted_files/usr/src/pkgdefs/SUNWiwk/postremove delete: deleted_files/usr/src/pkgdefs/SUNWiwk/prototype_com delete: deleted_files/usr/src/pkgdefs/SUNWiwk/prototype_i386 delete: deleted_files/usr/src/uts/common/io/iwk/fw-iw/LICENSE delete: deleted_files/usr/src/uts/common/io/iwk/fw-iw/iw4965.ucode.hex delete: deleted_files/usr/src/uts/common/io/iwk/iwk.c delete: deleted_files/usr/src/uts/common/io/iwk/iwk_eeprom.h delete: deleted_files/usr/src/uts/common/io/iwk/iwk_hw.h delete: deleted_files/usr/src/uts/common/io/iwk/iwk_var.h delete: deleted_files/usr/src/uts/intel/iwk/Makefile delete: usr/src/cmd/dladm/aggregation.conf delete: usr/src/cmd/dladm/linkprop.conf delete: usr/src/common/mpi/mpcpucache.c delete: usr/src/lib/libc/amd64/crt/cerror64.s delete: usr/src/lib/libc/common/sys/__fcntl.s delete: usr/src/lib/libc/common/sys/_rename.s delete: usr/src/lib/libc/port/gen/rename.c delete: usr/src/lib/libc/port/gen/wait3.c delete: usr/src/lib/libc/port/gen/wait4.c delete: usr/src/lib/libc/port/sys/fcntl.c delete: usr/src/lib/libc/port/sys/fsync.c delete: usr/src/lib/libc/sparc/sys/syssun.s delete: usr/src/lib/libinetcfg/common/inetcfg_nic.c delete: usr/src/lib/libinetcfg/common/inetcfg_nic.h delete: usr/src/pkgdefs/SUNWnxge.i/Makefile delete: usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl delete: usr/src/pkgdefs/SUNWnxge.i/postinstall delete: usr/src/pkgdefs/SUNWnxge.i/postremove delete: usr/src/pkgdefs/SUNWnxge.i/prototype_com delete: usr/src/pkgdefs/SUNWnxge.i/prototype_i386 delete: usr/src/uts/common/inet/kssl/kssldebug.h delete: usr/src/uts/common/io/drm/create_sunos_pci_lists.sh delete: usr/src/uts/common/io/drm/drm_pciids.txt delete: usr/src/uts/i86pc/nxge/Makefile delete: usr/src/uts/intel/io/drm/i915_sundrv.c update: usr/src/cmd/zfs/zfs_main.c update: usr/src/cmd/zpool/zpool_main.c update: usr/src/common/zfs/zfs_prop.c update: usr/src/common/zfs/zpool_prop.c update: usr/src/lib/libzfs/common/libzfs_crypto.c update: usr/src/lib/libzfs/common/libzfs_dataset.c update: usr/src/lib/libzfs/common/libzfs_pool.c update: usr/src/lib/libzfs/common/mapfile-vers update: usr/src/uts/common/crypto/io/aes.c update: usr/src/uts/common/fs/zfs/sys/zio_crypt.h update: usr/src/uts/common/fs/zfs/zio_crypt.c update: usr/src/uts/common/sys/fs/zfs.h
Am I missing something with mecurial here? This is the merge when i pulled updated changes from the zfscrypto gate to my gate.. Why does the parent need to know of a child''s merge.. shouldn''t the parent only care about what got changed with the parent gate? Anthony.Scarpino at sun.com wrote:> Author: Anthony Scarpino <Anthony.Scarpino at Sun.COM> > Repository: /hg/zfs-crypto/gate > Latest revision: 5c11f0c874f902f7a4aec79e03196101c7d9f5c3 > Total changesets: 1 > Log message: > merge > > Files: > delete: deleted_files/usr/src/pkgdefs/SUNWiwk/Makefile > delete: deleted_files/usr/src/pkgdefs/SUNWiwk/pkginfo.tmpl > delete: deleted_files/usr/src/pkgdefs/SUNWiwk/postinstall > delete: deleted_files/usr/src/pkgdefs/SUNWiwk/postremove > delete: deleted_files/usr/src/pkgdefs/SUNWiwk/prototype_com > delete: deleted_files/usr/src/pkgdefs/SUNWiwk/prototype_i386 > delete: deleted_files/usr/src/uts/common/io/iwk/fw-iw/LICENSE > delete: deleted_files/usr/src/uts/common/io/iwk/fw-iw/iw4965.ucode.hex > delete: deleted_files/usr/src/uts/common/io/iwk/iwk.c > delete: deleted_files/usr/src/uts/common/io/iwk/iwk_eeprom.h > delete: deleted_files/usr/src/uts/common/io/iwk/iwk_hw.h > delete: deleted_files/usr/src/uts/common/io/iwk/iwk_var.h > delete: deleted_files/usr/src/uts/intel/iwk/Makefile > delete: usr/src/cmd/dladm/aggregation.conf > delete: usr/src/cmd/dladm/linkprop.conf > delete: usr/src/common/mpi/mpcpucache.c > delete: usr/src/lib/libc/amd64/crt/cerror64.s > delete: usr/src/lib/libc/common/sys/__fcntl.s > delete: usr/src/lib/libc/common/sys/_rename.s > delete: usr/src/lib/libc/port/gen/rename.c > delete: usr/src/lib/libc/port/gen/wait3.c > delete: usr/src/lib/libc/port/gen/wait4.c > delete: usr/src/lib/libc/port/sys/fcntl.c > delete: usr/src/lib/libc/port/sys/fsync.c > delete: usr/src/lib/libc/sparc/sys/syssun.s > delete: usr/src/lib/libinetcfg/common/inetcfg_nic.c > delete: usr/src/lib/libinetcfg/common/inetcfg_nic.h > delete: usr/src/pkgdefs/SUNWnxge.i/Makefile > delete: usr/src/pkgdefs/SUNWnxge.i/pkginfo.tmpl > delete: usr/src/pkgdefs/SUNWnxge.i/postinstall > delete: usr/src/pkgdefs/SUNWnxge.i/postremove > delete: usr/src/pkgdefs/SUNWnxge.i/prototype_com > delete: usr/src/pkgdefs/SUNWnxge.i/prototype_i386 > delete: usr/src/uts/common/inet/kssl/kssldebug.h > delete: usr/src/uts/common/io/drm/create_sunos_pci_lists.sh > delete: usr/src/uts/common/io/drm/drm_pciids.txt > delete: usr/src/uts/i86pc/nxge/Makefile > delete: usr/src/uts/intel/io/drm/i915_sundrv.c > update: usr/src/cmd/zfs/zfs_main.c > update: usr/src/cmd/zpool/zpool_main.c > update: usr/src/common/zfs/zfs_prop.c > update: usr/src/common/zfs/zpool_prop.c > update: usr/src/lib/libzfs/common/libzfs_crypto.c > update: usr/src/lib/libzfs/common/libzfs_dataset.c > update: usr/src/lib/libzfs/common/libzfs_pool.c > update: usr/src/lib/libzfs/common/mapfile-vers > update: usr/src/uts/common/crypto/io/aes.c > update: usr/src/uts/common/fs/zfs/sys/zio_crypt.h > update: usr/src/uts/common/fs/zfs/zio_crypt.c > update: usr/src/uts/common/sys/fs/zfs.h > _______________________________________________ > zfs-crypto-discuss mailing list > zfs-crypto-discuss at opensolaris.org > http://mail.opensolaris.org/mailman/listinfo/zfs-crypto-discuss