[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision b7baf7045e97cce85fcabf91384e14b53c85
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision b7baf7045e97cce85fcabf91384e14b53c857d0f |
Date: |
Mon, 7 Jan 2008 13:05:36 +0100 |
-----------------------------------------------------------------
Revision: b7baf7045e97cce85fcabf91384e14b53c857d0f
Ancestor: 5697fe55bd31cea3cc7eff6ec21376d0bddf5f0e
Ancestor: ac8fd2f5ba859e6a8e11870051213356a7f6f75d
Author: address@hidden
Date: 2008-01-04T15:17:25
Branch: net.venge.monotone.cvsimport-branch-reconstruction
Deleted entries:
tests/show_conflicts tests/show_conflicts/__driver__.lua
Renamed entries:
visualc/unit_tests.vcproj to visualc/unit_tester.vcproj
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 cmd_diff_log.cc cmd_merging.cc
cmd_netsync.cc cmd_ws_commit.cc configure.ac diff_patch.cc
diff_patch.hh key_store.cc lua.cc m4/pcre.m4 merge.cc
monotone.texi netxx_pipe.cc paths.hh po/POTFILES.in po/de.po
po/es.po po/it.po po/sv.po rcs_import.cc roster.cc roster.hh
roster_merge.cc roster_merge.hh sanity.hh ssh_agent.cc
tester.cc tests/command_completion/__driver__.lua
tests/server_initiated_sync/__driver__.lua
visualc/monotone.sln visualc/runtests.bat
visualc/unit_tester.vcproj win32/main.cc work.cc
ChangeLog:
merge of '5697fe55bd31cea3cc7eff6ec21376d0bddf5f0e'
and 'ac8fd2f5ba859e6a8e11870051213356a7f6f75d'
monotone --db={your.database} diff
--revision=5697fe55bd31cea3cc7eff6ec21376d0bddf5f0e
--revision=b7baf7045e97cce85fcabf91384e14b53c857d0f
monotone --db={your.database} diff
--revision=ac8fd2f5ba859e6a8e11870051213356a7f6f75d
--revision=b7baf7045e97cce85fcabf91384e14b53c857d0f
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision b7baf7045e97cce85fcabf91384e14b53c857d0f,
monotone <=