monotone

monotone Mtn Change Log

Age Message
13 years 5 months 2006-02-12 Nathaniel Smith <njs@pobox.com>

* netsync.cc (serve_connections): Revert garbage that I
accidentally checked in last time...
Commit 9ca37b918cb5309d8d3b0be000dc8a1151df262f, by njs@pobox.com
13 years 5 months 2006-02-12 Nathaniel Smith <njs@pobox.com>

* NEWS: Add things done since last time I did this...
Commit 64fd1c6eb06f48d574ff7433178ba2b9b9138198, by njs@pobox.com
13 years 5 months merge of 96eb8df4b86d83771ff6e1d10d2d2c0379833c01

and 75feb7e56d894c2cc36398f7029ddb9c60d14944
Commit 0e98de4c3592d1e212dcdadd0546cf5771bf443c, by kinetik@orcon.net.nz
13 years 5 months merge of 55f642c2b7547b2c16648d2c26532e5510362062

and 6c370f1cff8bf324dd4dc082744a7750ba63de45
Commit 96eb8df4b86d83771ff6e1d10d2d2c0379833c01, by kinetik@orcon.net.nz
13 years 5 months 2006-02-11 Timothy Brownawell <tbrownaw@gmail.com>

Adding your db is silly and confusing (what should revert do?).
So, it's not allowed any more (the db file is ignored, regardless of
what the ignore hook says).
* tests/t_add_owndb.at: remove XFAIL, use 'ls known' instead of
'ls unknown'
* testsuite.at: don't put the db in the ignore hook
* database.{cc,hh}: is_dbfile(), check if a path is the database file
* work.cc: check is_dbfile where we check the ignore hook when
walking the filesystem
* tests/t_mt_ignore.at: fix for having the db always be ignored
Commit 6c370f1cff8bf324dd4dc082744a7750ba63de45, by Timothy Brownawell
13 years 5 months - fix the base64 data in test 258
Commit 18efa0d655a975446d2904488ffadd673f00018b, by andrieu@karryall.dnsalias.org
13 years 5 months merge of d633a1405c78eb605b0867ea59d571fcb5820f6a

and 6e87084a87413eed2c31100054ff8d5045f0be4d
13 years 5 months merge of 0b2ae1f7730e718a0bb6d8ff68f26eb356f4236e

and 69a8f8fe3985f4f00b885c948c843a6cb56d3500
13 years 5 months 2006-02-09 Nathaniel Smith <njs@pobox.com>

* Makefile.am (SQLITE_SOURCES): Remove header files lost in
latest SQLite upstream import.
Commit 69a8f8fe3985f4f00b885c948c843a6cb56d3500, by njs@pobox.com
13 years 5 months 2006-02-09 Graydon Hoare <graydon@pobox.com>

* lua.cc (hook_validate_commit_message): make validated the
default.
Commit f096a597553de2076bb493f5bbf7ccf0047304bb, by graydon@pobox.com
13 years 5 months merge of c0f7dc036749323c8299df03416bfadae1b606e3

and f4012263f1693501309caa5e50cdad25eaeaaf87
Commit 456de3795fcf0f9b2be4b5a041b96a9932600fef, by graydon@pobox.com
13 years 5 months merge of 720ac566d4c88a2efae36563ccb58b2ffdb0cc77

and d99d54dc9e0cd07e8992c6627b7ccd99ac59579f
13 years 5 months 2006-02-09 Richard Levitte <richard@levitte.org>

* tests/t_cvsimport.at, tests/t_cvsimport3.at,
tests/t_cvsimport_deleted_invar.at,
tests/t_cvsimport_manifest_cycle.at, tests/t_cvsimport_samelog.at,
tests/t_singlecvs.at: Changed to cope with the strictness of
CVSNT. It doesn't create a CSVROOT/history file automagically,
but CVSROOT/modules is created automatically both by the older CVS
and by CVSNT. You can't check out a group of files using revision
numbers with CVSNT. You MUST stand in the work directory for some
command with CVSNT. Finally, with CVSNT, 'cvs init' generates the
following message if you're a normal user, at least on Debian:

cvs init: Unable to register repository.
cvs init: Your login may not have sufficient permissions to modify the
cvs init: global server settings.
cvs init: Repository /home/levitte/cvsfoo initialised
13 years 5 months 2006-02-08 Richard Levitte <richard@levitte.org>

* testsuite.at, tests/t_ls_changed.at: News test, for "list
changed".

* monotone.texi, monotone.1: Document "list changed".
13 years 5 months 2006-02-08 Richard Levitte <richard@levitte.org>

* po/sv.po: Correct translations of changed messages, translate
new messages.
13 years 5 months 2006-02-08 Richard Levitte <richard@levitte.org>

* commands.cc (ls_changed, CMD(list)): Add a new command, "list
changed", to list changed files, always sorted in lexical order.
13 years 5 months * ui.cc (tick_write_count::write_ticks): Reverted lexical_cast,

back to F().
Commit 33b5733f1a767aedc4b408d36e6cffb9e4860611, by benoit@placenet.org
13 years 5 months * ui.cc (tick_write_count::write_ticks): Fixed utf8 handling.

boost::format + locale sucks, it ouputs "1\u+ffff24" for
"%d" % 1024.
Commit f28f306ccd3ff2c57df9d0005876a00370af2739, by benoit@placenet.org
13 years 5 months 2006-02-02 Emile Snyder <emile@alumni.reed.edu>

* merge.cc (resolve_merge_conflicts): If the merge has non-content
conflicts warn the user and abort before making them do content
merges. Move logging/warning of conflicts to methods in the
roster_merge_result struct.

* roster_merge.{cc,hh} (log_conflicts,
warn_non_content_conflicts): New methods to do the busy work of
logging or warning.
Commit 2ce49d63199b5375fbd78522dc3a32caaf099880, by emile@talentcodeworks.com
13 years 5 months 2006-02-02 Emile Snyder <emile@alumni.reed.edu>

* netsync.cc (run_netsync_protocol): Print a warning if either the
include or the exclude branch pattern have a ' or a " character
anywhere in them. Hopefully will help users running in a Windows
shell when they do: monotone sync myserver 'mybranch*' and nothing
happens because the ' characters are passed in to monotone.
Commit 7baa379c35a569ba8e02c163282583294fc3ab55, by emile@talentcodeworks.com
13 years 5 months 2005-01-30 Emile Snyder <emile@alumni.reed.edu>

annotate.cc: (do_annotate) Add ticker for revisions processed to
annotate command.
Commit b5ccb7aef03d1d54935ac57c76dc4056a0283a27, by emile@talentcodeworks.com
13 years 5 months 2006-01-29 Richard Levitte <richard@levitte.org>

* po/sv.po: Update a few translations, leave a number of fuzzy
ones until we've decided how "workspace" should be translated.
13 years 5 months 2006-01-27 Matthew Gregan <kinetik@orcon.net.nz>

* *: Use the term 'workspace' consistently throughout monotone for
the concept we previously described interchangably using the two
terms 'working copy' and 'working directory'. This change has
been made everywhere except in historical documentation (NEWS and
ChangeLog).
Commit 658235874619f05d77cad52addeee2b33688b487, by kinetik@orcon.net.nz
13 years 5 months 2006-01-27 Richard Levitte <richard@levitte.org>

* monotone.texi (Generating Keys): Correct small type, the keys
are not stored in /home/jim/.monotone/monotonerc.
13 years 5 months merge of 280895f030e000ef85a7ffd4f87d8c7c5926e42f

and fee396959539c84349622948986fd16ffaa35191

Branches

Tags

Quick Links:     www.monotone.ca    -     Downloads    -     Documentation    -     Wiki    -     Code Forge    -     Build Status