[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 4a4a9762d1486e644ae8cc0f545a3ae82ab5
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 4a4a9762d1486e644ae8cc0f545a3ae82ab5c291 |
Date: |
Fri, 7 Dec 2007 07:05:29 +0100 |
-----------------------------------------------------------------
Revision: 4a4a9762d1486e644ae8cc0f545a3ae82ab5c291
Ancestor: 3b45396a09c1448f180f5354f9f7b7030d570411
Ancestor: ab21ddc77289e2dcff60b26a94ef8f524cde3b2f
Author: address@hidden
Date: 2007-11-28T04:37:25
Branch: net.venge.monotone.cleanup.conflict-messages
Deleted entries:
botan/gzip.cpp botan/gzip.h
contrib/diff3_keep_conflicts_merger.lua
debian/monotone.install views.sql
Renamed entries:
contrib/monotone-mail-notify-standalone.lua to
contrib/monotone-mail-notify.lua
debian/monotone.info to debian/monotone-doc.info
tests/automate_inventory/inventory_hooks.lua to
tests/inventory_hooks.lua
Added files:
botan/cbc_mac.cpp botan/cbc_mac.h botan/dsa_gen.cpp
botan/loadstor.h botan/zlib.cpp botan/zlib.h
contrib/ciabot_monotone_hookversion.lua
contrib/command/README contrib/command/base.lua
contrib/command/conflicts.lua contrib/command/fuse.lua
contrib/command/revision.lua contrib/monotone-mail-notify.sh
debian/monotone-doc.dirs gzip.cc gzip.hh m4/pcre.m4
m4/pkg.m4 pcre/README pcre/pcre.h pcre/pcre_chartables.c
pcre/pcre_compile.c pcre/pcre_config.c pcre/pcre_config.h
pcre/pcre_dfa_exec.c pcre/pcre_exec.c pcre/pcre_fullinfo.c
pcre/pcre_get.c pcre/pcre_globals.c pcre/pcre_info.c
pcre/pcre_internal.h pcre/pcre_maketables.c
pcre/pcre_newline.c pcre/pcre_ord2utf8.c
pcre/pcre_refcount.c pcre/pcre_study.c pcre/pcre_tables.c
pcre/pcre_try_flipped.c pcre/pcre_ucp_searchfuncs.c
pcre/pcre_valid_utf8.c pcre/pcre_version.c
pcre/pcre_xclass.c pcre/pcrepattern.texi
pcre/pcresyntax.texi pcre/ucp.h pcre/ucpinternal.h
pcre/ucptable.h pcrewrap.cc pcrewrap.hh
tests/automate_inventory_restricted/__driver__.lua
tests/common/test_utils_inventory.lua
tests/duplicate_key_id/__driver__.lua
tests/duplicate_key_id/bad_test_key
tests/merge((patch_a),_(drop_a))/__driver__.lua
tests/netsync_duplicate_keys/__driver__.lua
tests/non_content_conflicts/__driver__.lua
tests/syntax_errors_in_.mtn-ignore/__driver__.lua
tests/syntax_errors_in_.mtn-ignore/mtn-ignore
tests/syntax_errors_in_.mtn-ignore/stderr-ref
tests/syntax_errors_in_.mtn-ignore/stdout-ref
visualc/pcre.vcproj
Added directories:
contrib/command pcre tests/automate_inventory_restricted
tests/duplicate_key_id tests/merge((patch_a),_(drop_a))
tests/netsync_duplicate_keys tests/non_content_conflicts
tests/syntax_errors_in_.mtn-ignore
Modified files:
.mtn-ignore AUTHORS COPYING HACKING INSTALL Makefile.am NEWS
UPGRADE automate.cc base.hh botan/README.botan-monotone
botan/aes.cpp botan/aes.h botan/aes_tab.cpp botan/alg_id.cpp
botan/alg_id.h botan/allocate.h botan/arc4.cpp botan/arc4.h
botan/asn1_alt.cpp botan/asn1_att.cpp botan/asn1_dn.cpp
botan/asn1_int.cpp botan/asn1_int.h botan/asn1_ku.cpp
botan/asn1_obj.h botan/asn1_oid.cpp botan/asn1_oid.h
botan/asn1_str.cpp botan/asn1_tm.cpp botan/base.cpp
botan/base.h botan/base64.cpp botan/base64.h
botan/basefilt.cpp botan/basefilt.h botan/ber_dec.cpp
botan/ber_dec.h botan/big_base.cpp botan/big_code.cpp
botan/big_io.cpp botan/big_ops2.cpp botan/big_ops3.cpp
botan/big_rand.cpp botan/bigint.h botan/bit_ops.cpp
botan/bit_ops.h botan/blinding.cpp botan/blinding.h
botan/botan.h botan/buf_es.cpp botan/buf_es.h
botan/buf_filt.cpp botan/buf_filt.h botan/build.h
botan/cbc.cpp botan/cbc.h botan/certstor.cpp
botan/certstor.h botan/cfb.cpp botan/cfb.h botan/charset.cpp
botan/charset.h botan/config.cpp botan/config.h
botan/crc32.cpp botan/crc32.h botan/credits.txt
botan/crl_ent.cpp botan/crl_ent.h botan/ctr.cpp botan/ctr.h
botan/cts.cpp botan/cts.h botan/data_snk.cpp
botan/data_snk.h botan/data_src.cpp botan/data_src.h
botan/datastor.cpp botan/datastor.h botan/def_alg.cpp
botan/def_char.cpp botan/def_char.h botan/def_mode.cpp
botan/def_ops.cpp botan/def_powm.cpp botan/def_powm.h
botan/defalloc.cpp botan/defalloc.h botan/der_enc.cpp
botan/der_enc.h botan/des.cpp botan/des.h botan/des_tab.cpp
botan/dh.cpp botan/dh.h botan/divide.cpp botan/dl_algo.cpp
botan/dl_algo.h botan/dl_group.cpp botan/dl_group.h
botan/dlies.cpp botan/dlies.h botan/eax.cpp botan/eax.h
botan/ecb.cpp botan/ecb.h botan/eme.h botan/eme1.cpp
botan/eme_pkcs.cpp botan/emsa.h botan/emsa1.cpp
botan/emsa2.cpp botan/emsa3.cpp botan/emsa4.cpp
botan/emsa_raw.cpp botan/eng_base.cpp botan/eng_def.h
botan/engine.cpp botan/engine.h botan/enums.h
botan/es_capi.cpp botan/es_capi.h botan/es_egd.cpp
botan/es_egd.h botan/es_file.cpp botan/es_file.h
botan/es_win32.cpp botan/es_win32.h botan/exceptn.cpp
botan/exceptn.h botan/filter.cpp botan/filter.h
botan/filters.cpp botan/filters.h botan/fips140.cpp
botan/fips140.h botan/get_algo.cpp botan/get_enc.cpp
botan/get_pbe.cpp botan/hash_id.cpp botan/hash_id.h
botan/hex.cpp botan/hex.h botan/hmac.cpp botan/hmac.h
botan/if_algo.cpp botan/if_algo.h botan/inifile.cpp
botan/init.h botan/init_def.cpp botan/init_opt.cpp
botan/jacobi.cpp botan/kdf.cpp botan/kdf.h botan/keypair.cpp
botan/keypair.h botan/libstate.cpp botan/libstate.h
botan/license.txt botan/look_add.h botan/look_pk.cpp
botan/look_pk.h botan/lookup.h botan/make_prm.cpp
botan/mdx_hash.cpp botan/mdx_hash.h botan/mem_ops.h
botan/mem_pool.cpp botan/mem_pool.h botan/mgf1.cpp
botan/mgf1.h botan/mlock.cpp botan/mode_pad.cpp
botan/mode_pad.h botan/modebase.cpp botan/modebase.h
botan/modules.cpp botan/modules.h botan/mp_asm.cpp
botan/mp_asm.h botan/mp_asmi.h botan/mp_comba.cpp
botan/mp_core.h botan/mp_misc.cpp botan/mp_mul.cpp
botan/mp_mulop.cpp botan/mp_numth.cpp botan/mp_shift.cpp
botan/mp_sqr.cpp botan/mp_types.h botan/mutex.cpp
botan/mutex.h botan/numthry.cpp botan/numthry.h
botan/ofb.cpp botan/ofb.h botan/oids.cpp botan/oids.h
botan/out_buf.cpp botan/out_buf.h botan/parsing.cpp
botan/parsing.h botan/pbe.h botan/pbe_pkcs.h botan/pbes1.cpp
botan/pbes2.cpp botan/pem.cpp botan/pem.h botan/pipe.cpp
botan/pipe.h botan/pipe_io.cpp botan/pipe_rw.cpp
botan/pk_algs.cpp botan/pk_algs.h botan/pk_core.cpp
botan/pk_core.h botan/pk_filts.cpp botan/pk_filts.h
botan/pk_keys.cpp botan/pk_keys.h botan/pk_ops.h
botan/pk_util.cpp botan/pk_util.h botan/pkcs10.cpp
botan/pkcs10.h botan/pkcs5.cpp botan/pkcs5.h botan/pkcs8.cpp
botan/pkcs8.h botan/policy.cpp botan/pow_mod.cpp
botan/pow_mod.h botan/powm_fw.cpp botan/powm_mnt.cpp
botan/prf_x942.cpp botan/primes.cpp botan/pubkey.cpp
botan/pubkey.h botan/randpool.cpp botan/randpool.h
botan/reducer.cpp botan/reducer.h botan/rng.cpp botan/rng.h
botan/rsa.cpp botan/rsa.h botan/s2k.cpp botan/s2k.h
botan/secmem.h botan/secqueue.cpp botan/secqueue.h
botan/sha160.cpp botan/sha160.h botan/sha256.cpp
botan/sha256.h botan/stl_util.h botan/symkey.cpp
botan/symkey.h botan/timers.cpp botan/timers.h botan/types.h
botan/ui.cpp botan/ui.h botan/util.cpp botan/util.h
botan/version.h botan/x509_ca.cpp botan/x509_ca.h
botan/x509_crl.cpp botan/x509_crl.h botan/x509_ext.cpp
botan/x509_ext.h botan/x509_key.cpp botan/x509_key.h
botan/x509_obj.cpp botan/x509_obj.h botan/x509cert.cpp
botan/x509cert.h botan/x509find.cpp botan/x509find.h
botan/x509opt.cpp botan/x509self.cpp botan/x509self.h
botan/x509stat.cpp botan/x509stat.h botan/x509stor.cpp
botan/x509stor.h botan/x931_rng.cpp botan/x931_rng.h cert.cc
charset.cc charset.hh cmd.hh cmd_automate.cc cmd_diff_log.cc
cmd_files.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
cmd_ws_commit.cc commands.cc configure.ac constants.cc
constants.hh contrib/README
contrib/ciabot_monotone_hookversion.py
contrib/extra-commands.lua contrib/monotone-mail-notify.lua
contrib/monotone-notify.pl contrib/monotone.zsh_completion
database.cc database.hh debian/NEWS debian/changelog
debian/control debian/copyright debian/monotone-doc.docs
debian/monotone-doc.info debian/monotone-server.config
debian/monotone-server.monotone.init
debian/monotone-server.postinst debian/monotone.docs
debian/mtn.1 debian/rules diff_patch.cc globish.cc
globish.hh inodeprint.hh key_store.cc key_store.hh lcs.cc
lua-testsuite.lua lua.cc lua_hooks.cc lua_hooks.hh
luaext_globish.cc m4/boost.m4 mac/readme-mac.txt merge.cc
monotone.spec monotone.texi mt_version.cc netcmd.cc
netcmd.hh netsync.cc notes/testsuite.txt options_list.hh
packet.cc paths.cc pch.hh po/POTFILES.in po/de.po po/es.po
po/it.po po/sv.po project.cc revision.cc roster.cc roster.hh
roster_merge.cc roster_merge.hh selectors.cc selectors.hh
simplestring_xform.cc sqlite/os_unix.c sqlite/sqliteInt.h
std_hooks.lua testlib.lua tests/alias_command/__driver__.lua
tests/annotate_accidental_clean_merge/__driver__.lua
tests/annotate_file_whose_name_changed/__driver__.lua
tests/annotate_where_line_splits/__driver__.lua
tests/annotate_where_lineage_depends_on_traversal/__driver__.lua
tests/annotate_where_one_parent_is_full_copy/__driver__.lua
tests/automate_inventory/__driver__.lua
tests/empty_environment/__driver__.lua
tests/fetching_nonexistent_entry_from_children_bug/__driver__.lua
tests/importing_files_with_non-english_names/__driver__.lua
tests/invoke_toplevel_group/__driver__.lua
tests/log_quits_on_SIGPIPE/hookfile
tests/merge_into_workspace/expected-log
tests/merge_into_workspace/expected-log-left
tests/restricted_diff_bug/__driver__.lua
tests/restrictions_with_renames_and_adds/__driver__.lua
tests/show_conflicts/__driver__.lua
tests/test_annotate_command/__driver__.lua
tests/things_in_.mtn-ignore_get_ignored/__driver__.lua
tests/user_commands/extra_rc transforms.cc ui.hh
unix/main.cc uri.cc uri.hh visualc/botan.vcproj
visualc/config.h visualc/monotone.sln
visualc/monotone.vcproj visualc/runtests.bat
visualc/stringprep.vcproj visualc/tester.vcproj
visualc/txt2c.vcproj visualc/unit_tests.vcproj vocab.cc
vocab_terms.hh win32/README win32/main.cc win32/monotone.iss
win32/ssh_agent_platform.cc win32/ssh_agent_platform.hh
win32/tester-plaf.cc work.cc work.hh
ChangeLog:
propagate from branch 'net.venge.monotone' (head
3b45396a09c1448f180f5354f9f7b7030d570411)
to branch 'net.venge.monotone.cleanup.conflict-messages' (head
ab21ddc77289e2dcff60b26a94ef8f524cde3b2f)
monotone --db={your.database} diff
--revision=3b45396a09c1448f180f5354f9f7b7030d570411
--revision=4a4a9762d1486e644ae8cc0f545a3ae82ab5c291
monotone --db={your.database} diff
--revision=ab21ddc77289e2dcff60b26a94ef8f524cde3b2f
--revision=4a4a9762d1486e644ae8cc0f545a3ae82ab5c291
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 4a4a9762d1486e644ae8cc0f545a3ae82ab5c291,
monotone <=