[Monotone-commits-diffs] Revision 6c00a40ef3b61e6518b1c070f34477f8517ca34c

[monotone]

-----------------------------------------------------------------
Revision: 6c00a40ef3b61e6518b1c070f34477f8517ca34c
Ancestor: 1b46846dc599346d69d8c2c1dd78a2ba265183de
Ancestor: 36685596a4c21f2f4bf95a4ec8a498b1f25b7136
Author: address@hidden
Date: 2005-07-13T23:46:16

Added files:
        tests/t_ambiguous_tags.at tests/t_kill_tag_locally.at
        tests/t_merge_binary.at
Modified files:
        AUTHORS ChangeLog Makefile.am commands.cc constants.cc
        constants.hh contrib/ciabot_monotone.py database.cc
        database.hh monotone.texi netsync.cc rcs_import.cc
        schema_migration.cc tests/t_cvsimport_drepper2.at
        tests/t_update_off_branch.at testsuite.at

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
36685596a4c21f2f4bf95a4ec8a498b1f25b7136)
            to branch 'net.venge.monotone.sqlite3' (head 
1b46846dc599346d69d8c2c1dd78a2ba265183de)

txtp9svbQF6wN.txt
Description: Diff [1b46846dc599346d69d8c2c1dd78a2ba265183de] -> [6c00a40ef3b61e6518b1c070f34477f8517ca34c]

txtpdRuhtlKIk.txt
Description: Diff [36685596a4c21f2f4bf95a4ec8a498b1f25b7136] -> [6c00a40ef3b61e6518b1c070f34477f8517ca34c]