monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 4ed353fd6e17980d7e579987f33594b85664c6


From: monotone
Subject: [Monotone-commits-diffs] Revision 4ed353fd6e17980d7e579987f33594b85664c6c7
Date: Thu, 17 Jan 2008 12:06:31 +0100

-----------------------------------------------------------------
Revision: 4ed353fd6e17980d7e579987f33594b85664c6c7
Ancestor: 4c0c4c4111dec5c850e3db5c984c889d1b4d4d95
Ancestor: b0d5ce2310eb08d1623c0cd70edffb4687f23f52
Author: address@hidden
Date: 2007-12-09T17:22:48
Branch: net.venge.monotone.mark-merge-existence

Added files:
        tests/duplicate_key_id/__driver__.lua
        tests/duplicate_key_id/bad_test_key
        tests/merge((patch_a),_(drop_a))/__driver__.lua
Added directories:
        tests/duplicate_key_id tests/merge((patch_a),_(drop_a))
Modified files:
        AUTHORS NEWS automate.cc basic_io.hh cert.cc cmd_list.cc
        cmd_merging.cc database.cc database.hh debian/changelog
        debian/copyright debian/rules file_io.hh
        notes/release-checklist.txt numeric_vocab.cc packet.cc
        platform.hh po/de.po po/es.po po/it.po po/sv.po roster.cc
        roster.hh roster_merge.cc std_hooks.lua tester.cc
        tests/syntax_errors_in_.mtn-ignore/__driver__.lua
        visualc/runtests.bat win32/ssh_agent_platform.cc
        win32/ssh_agent_platform.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
4c0c4c4111dec5c850e3db5c984c889d1b4d4d95)
            to branch 'net.venge.monotone.mark-merge-existence' (head 
b0d5ce2310eb08d1623c0cd70edffb4687f23f52)


monotone --db={your.database} diff 
--revision=4c0c4c4111dec5c850e3db5c984c889d1b4d4d95 
--revision=4ed353fd6e17980d7e579987f33594b85664c6c7
monotone --db={your.database} diff 
--revision=b0d5ce2310eb08d1623c0cd70edffb4687f23f52 
--revision=4ed353fd6e17980d7e579987f33594b85664c6c7
----------------------------------------------------------------------




reply via email to

[Prev in Thread] Current Thread [Next in Thread]