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

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

[Monotone-commits-diffs] Revision 54c28eebaaf336d61923f81a36fe7bf9f935e0


From: monotone
Subject: [Monotone-commits-diffs] Revision 54c28eebaaf336d61923f81a36fe7bf9f935e018
Date: Wed, 2 Jan 2008 23:05:31 +0100

-----------------------------------------------------------------
Revision: 54c28eebaaf336d61923f81a36fe7bf9f935e018
Ancestor: 33c515801172ee0ef2909801b1981fa4328ff139
Ancestor: a29eea180354532ef9c0126ba33d1a6e60e90fa4
Author: address@hidden
Date: 2008-01-02T21:03:06
Branch: net.venge.monotone

Deleted entries:
        tests/show_conflicts tests/show_conflicts/__driver__.lua
Renamed entries:
        tests/automate_db_set,get to tests/automate_db_variables
Added files:
        tests/calculation_of_unidiffs_start_of_file/__driver__.lua
        tests/calculation_of_unidiffs_start_of_file/firstfile
        tests/calculation_of_unidiffs_start_of_file/secondfile
        tests/conflict_messages/__driver__.lua
Added directories:
        tests/calculation_of_unidiffs_start_of_file
        tests/conflict_messages
Modified files:
        Makefile.am NEWS UPGRADE automate.cc cmd_automate.cc
        cmd_diff_log.cc cmd_files.cc cmd_key_cert.cc cmd_list.cc
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc configure.ac
        debian/changelog diff_patch.cc diff_patch.hh key_store.cc
        lcs.cc lru_writeback_cache.hh lua.cc m4/pcre.m4 merge.cc
        monotone.spec monotone.texi netsync.cc netxx/address.cxx
        netxx/peer.cxx netxx_pipe.cc paths.hh po/POTFILES.in
        po/de.po po/es.po po/it.po po/sv.po roster.cc roster.hh
        roster_merge.cc roster_merge.hh sanity.hh ssh_agent.cc
        tester.cc tests/automate_db_variables/__driver__.lua
        tests/command_completion/__driver__.lua
        tests/server_initiated_sync/__driver__.lua unix/fs.cc
        unix/tester-plaf.cc visualc/config.h win32/monotone.iss
        work.cc xdelta.cc

ChangeLog: 

merge of '33c515801172ee0ef2909801b1981fa4328ff139'
     and 'a29eea180354532ef9c0126ba33d1a6e60e90fa4'


monotone --db={your.database} diff 
--revision=33c515801172ee0ef2909801b1981fa4328ff139 
--revision=54c28eebaaf336d61923f81a36fe7bf9f935e018
monotone --db={your.database} diff 
--revision=a29eea180354532ef9c0126ba33d1a6e60e90fa4 
--revision=54c28eebaaf336d61923f81a36fe7bf9f935e018
----------------------------------------------------------------------




reply via email to

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