[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 888fa0de06ea36f83333f012c06eab3485e1
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 888fa0de06ea36f83333f012c06eab3485e16e7f |
Date: |
Sat, 27 Dec 2008 11:11:10 +0100 |
-----------------------------------------------------------------
Revision: 888fa0de06ea36f83333f012c06eab3485e16e7f
Ancestor: 592d1a58fc22c9e30bd08fd01d9e4466ecd65c9d
Ancestor: 75ac12dd5b02025981edd6cd03caebb54721e481
Author: Richard Levitte <address@hidden>
Date: 2008-12-27T01:31:24
Branch: net.venge.monotone.debian-diff
Deleted entries:
botan/bit_ops.cpp botan/config.cpp botan/config.h
botan/def_char.cpp botan/def_char.h botan/mp_sqr.cpp
botan/pk_filts.cpp botan/pk_filts.h botan/x509stat.cpp
botan/x509stat.h smap.hh
Renamed entries:
botan/big_base.cpp to botan/bigint.cpp
botan/fips140.cpp to botan/selftest.cpp
botan/fips140.h to botan/selftest.h
botan/mp_mul.cpp to botan/mp_karat.cpp
tests/resolve_duplicate_name_conflict to
tests/resolve_conflicts_duplicate_name
Added files:
botan/bswap.h botan/mp_monty.cpp botan/noekeon.cpp
botan/noekeon.h botan/rotate.h botan/xor_buf.h
cmd_conflicts.cc debian/patches/00list
tests/_--no-workspace/__driver__.lua
tests/attr_mtn_execute/__driver__.lua
tests/automate_file_merge/__driver__.lua
tests/automate_lua/__driver__.lua
tests/automate_lua/test.lua
tests/automate_read_packets/__driver__.lua
tests/invalid__MTN_options/__driver__.lua
tests/ls_duplicates_with_duplicates/__driver__.lua
tests/ls_duplicates_with_workspace/__driver__.lua
tests/ls_duplicates_without_duplicates/__driver__.lua
tests/resolve_conflicts_all_merge_commands/__driver__.lua
tests/resolve_conflicts_all_resolutions/__driver__.lua
tests/resolve_conflicts_all_resolutions/conflicts-1
tests/resolve_conflicts_all_resolutions/conflicts-resolved
tests/resolve_conflicts_all_resolutions/merge-1
tests/resolve_conflicts_all_resolutions/merge3_hook.lua
tests/resolve_conflicts_all_resolutions/show_first-checkout_left
tests/resolve_conflicts_all_resolutions/show_first-checkout_right
tests/resolve_conflicts_all_resolutions/show_first-interactive
tests/resolve_conflicts_all_resolutions/show_first-thermostat
tests/resolve_conflicts_all_resolutions/show_first-user
tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
tests/resolve_conflicts_all_resolutions/show_remaining-thermostat
tests/resolve_conflicts_content/__driver__.lua
tests/resolve_conflicts_content/conflicts-1
tests/resolve_conflicts_content/conflicts-2
tests/resolve_conflicts_content/merge-1
tests/resolve_conflicts_content/update-1
tests/resolve_conflicts_duplicate_name/conflicts-1
tests/resolve_conflicts_duplicate_name/conflicts-resolved
tests/resolve_conflicts_duplicate_name/merge-1
tests/resolve_conflicts_errors/__driver__.lua
tests/resolve_conflicts_errors/conflicts-attr-show-1
tests/resolve_conflicts_errors/conflicts-attr-show-2
tests/resolve_conflicts_errors/conflicts-attr-store-1
tests/resolve_conflicts_errors/conflicts-attr-store-2
tests/resolve_conflicts_errors/merge-old-conflicts-file
tests/resolve_conflicts_multiple_names/__driver__.lua
tests/resolve_conflicts_none/__driver__.lua
tests/resolve_conflicts_none/conflicts-1
tests/resolve_conflicts_none/merge-1
tests/resolve_conflicts_none/update-1
tests/resolve_conflicts_propagate/__driver__.lua
tests/resolve_conflicts_propagate/conflicts-1
tests/resolve_conflicts_propagate/conflicts-2
tests/resolve_conflicts_propagate/conflicts-resolved
tests/resolve_conflicts_propagate/propagate-1
tests/resolve_conflicts_propagate/propagate-2
tests/resolve_conflicts_read_all/__driver__.lua
tests/resolve_conflicts_read_all/attribute-attached_left
tests/resolve_conflicts_read_all/attribute-attached_right
tests/resolve_conflicts_read_all/attribute-detached_left
tests/resolve_conflicts_read_all/attribute-detached_right
tests/resolve_conflicts_read_all/content-attached_left
tests/resolve_conflicts_read_all/content-attached_right
tests/resolve_conflicts_read_all/content-detached_left
tests/resolve_conflicts_read_all/content-detached_right
tests/resolve_conflicts_read_all/directory-loop_left
tests/resolve_conflicts_read_all/directory-loop_right
tests/resolve_conflicts_read_all/duplicate-add-rename_left
tests/resolve_conflicts_read_all/duplicate-add-rename_right
tests/resolve_conflicts_read_all/duplicate-adds_left
tests/resolve_conflicts_read_all/duplicate-adds_right
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_left
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_right
tests/resolve_conflicts_read_all/duplicate-renames_left
tests/resolve_conflicts_read_all/duplicate-renames_right
tests/resolve_conflicts_read_all/invalid-add_left
tests/resolve_conflicts_read_all/invalid-add_right
tests/resolve_conflicts_read_all/invalid-rename_left
tests/resolve_conflicts_read_all/invalid-rename_right
tests/resolve_conflicts_read_all/missing-root_left
tests/resolve_conflicts_read_all/missing-root_right
tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_left
tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_right
tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_left
tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_right
tests/resolve_conflicts_read_all/multiple-name-plus-orphan_left
tests/resolve_conflicts_read_all/multiple-name-plus-orphan_right
tests/resolve_conflicts_read_all/multiple-names_left
tests/resolve_conflicts_read_all/multiple-names_right
tests/resolve_conflicts_read_all/orphaned-add_left
tests/resolve_conflicts_read_all/orphaned-add_right
tests/resolve_conflicts_read_all/orphaned-rename_left
tests/resolve_conflicts_read_all/orphaned-rename_right
tests/resolve_conflicts_read_all/unrelated-projects_left
tests/resolve_conflicts_read_all/unrelated-projects_right
Added directories:
debian/patches tests/_--no-workspace tests/attr_mtn_execute
tests/automate_file_merge tests/automate_lua
tests/automate_read_packets tests/invalid__MTN_options
tests/ls_duplicates_with_duplicates
tests/ls_duplicates_with_workspace
tests/ls_duplicates_without_duplicates
tests/resolve_conflicts_all_merge_commands
tests/resolve_conflicts_all_resolutions
tests/resolve_conflicts_content
tests/resolve_conflicts_errors
tests/resolve_conflicts_multiple_names
tests/resolve_conflicts_none
tests/resolve_conflicts_propagate
tests/resolve_conflicts_read_all
Modified files:
AUTHORS HACKING Makefile.am NEWS UPGRADE app_state.cc
app_state.hh asciik.cc automate.cc basic_io.cc basic_io.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_code.cpp botan/big_io.cpp
botan/big_ops2.cpp botan/big_ops3.cpp botan/big_rand.cpp
botan/bigint.cpp botan/bigint.h 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/cbc_mac.cpp botan/cbc_mac.h botan/certstor.cpp
botan/certstor.h botan/cfb.cpp botan/cfb.h botan/charset.cpp
botan/charset.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_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/dsa_gen.cpp
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_dev.cpp botan/es_dev.h botan/es_egd.cpp
botan/es_egd.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/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/info.txt 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/loadstor.h 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_karat.cpp botan/mp_misc.cpp
botan/mp_mulop.cpp botan/mp_numth.cpp botan/mp_shift.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_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/selftest.cpp botan/selftest.h botan/sha160.cpp
botan/sha160.h botan/sha256.cpp botan/sha256.h
botan/stl_util.h botan/symkey.cpp botan/symkey.h
botan/thanks.txt 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/x509stor.cpp botan/x509stor.h
botan/x931_rng.cpp botan/x931_rng.h cert.cc cert.hh cmd.hh
cmd_automate.cc cmd_db.cc cmd_diff_log.cc cmd_files.cc
cmd_key_cert.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
cmd_packet.cc cmd_ws_commit.cc commands.cc configure.ac
contrib/ciabot_monotone.py database.cc database.hh dates.cc
debian/rules diff_patch.cc diff_patch.hh globish.cc
globish.hh gzip.cc gzip.hh key_store.cc key_store.hh keys.cc
lua/luaconf.h lua.cc lua.hh lua_hooks.cc lua_hooks.hh
merge.cc merge.hh merkle_tree.cc mkstemp.cc monotone.cc
monotone.spec monotone.texi mt_version.cc netcmd.cc netio.hh
netsync.cc netxx/socket.cxx notes/release-checklist.txt
options_list.hh packet.cc paths.cc paths.hh po/LINGUAS
po/POTFILES.in po/de.po po/es.po po/fr.po po/it.po po/sv.po
randomfile.hh rcs_import.cc rev_height.hh revision.cc
revision.hh roster.cc roster.hh roster_merge.cc
roster_merge.hh sanity.hh schema_migration.cc selectors.cc
simplestring_xform.cc std_hooks.lua string_queue.cc
tester.cc testlib.lua
tests/automate_content_diff/__driver__.lua
tests/automate_show_conflicts/__driver__.lua
tests/automate_show_conflicts/expected-content-attached.stdout
tests/automate_show_conflicts/expected-directory-loop.stdout
tests/common/netsync.lua
tests/empty_string_as_a_path_name/__driver__.lua
tests/resolve_conflicts_duplicate_name/__driver__.lua
tests/schema_migration_with_rosterify/__driver__.lua
tests/two_parent_workspace_commands_that_fail/__driver__.lua
tests/util_mtnopt/__driver__.lua transforms.cc transforms.hh
ui.cc visualc/config.h vocab.cc vocab.hh vocab_macros.hh
win32/README win32/monotone.iss work.cc xdelta.cc
Modified attrs:
tests/resolve_conflicts_errors/__driver__.lua
tests/resolve_conflicts_errors/conflicts-attr-store-1
ChangeLog:
explicit merge of '75ac12dd5b02025981edd6cd03caebb54721e481'
and '592d1a58fc22c9e30bd08fd01d9e4466ecd65c9d'
to branch 'net.venge.monotone.debian-diff'
monotone --db={your.database} diff
--revision=592d1a58fc22c9e30bd08fd01d9e4466ecd65c9d
--revision=888fa0de06ea36f83333f012c06eab3485e16e7f
monotone --db={your.database} diff
--revision=75ac12dd5b02025981edd6cd03caebb54721e481
--revision=888fa0de06ea36f83333f012c06eab3485e16e7f
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 888fa0de06ea36f83333f012c06eab3485e16e7f,
monotone <=