[Monotone-commits-diffs] Revision 9bd54ebee3a32ced518fa0ae2b4bdc5bec49ded5

[monotone]

-----------------------------------------------------------------
Revision: 9bd54ebee3a32ced518fa0ae2b4bdc5bec49ded5
Ancestor: 12919eebaf07a0461a889acc2a8a588b92d7486b
Ancestor: d7745df82d221e8794c9f36a921ea7930709227b
Author: Thomas Moschny <address@hidden>
Date: 2007-02-19T22:06:32
Branch: net.venge.monotone.experiment.annotate.roster_deltas

Deleted entries:
        mtn.1
Added files:
        asciik.cc asciik.hh
        tests/annotate_accidental_clean_merge/__driver__.lua
Added directories:
        tests/annotate_accidental_clean_merge
Modified files:
        Makefile.am annotate.cc botan/ber_dec.cpp charset.cc
        cmd_diff_log.cc configure.ac contrib/monotone-import.pl
        contrib/monotone-notify-hookversion.lua
        contrib/monotone-notify.pl database.cc database.hh
        options_list.hh po/POTFILES.in po/de.po po/it.po po/sv.po
        rev_height.cc rev_height.hh roster_delta.cc roster_delta.hh
        tests/import/__driver__.lua tests/test_a_merge_8/correct
        tests/test_a_merge_8/left tests/test_a_merge_8/parent
        tests/test_a_merge_8/right

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
12919eebaf07a0461a889acc2a8a588b92d7486b)
            to branch 'net.venge.monotone.experiment.annotate.roster_deltas' 
(head d7745df82d221e8794c9f36a921ea7930709227b)


monotone --db={your.database} diff 
--revision=12919eebaf07a0461a889acc2a8a588b92d7486b 
--revision=9bd54ebee3a32ced518fa0ae2b4bdc5bec49ded5
monotone --db={your.database} diff 
--revision=d7745df82d221e8794c9f36a921ea7930709227b 
--revision=9bd54ebee3a32ced518fa0ae2b4bdc5bec49ded5
----------------------------------------------------------------------