2009-06-14 19:49:18 by Joerg Sonnenberger | Files touched by this commit (454) |
Log message:
Remove @dirrm entries from PLISTs
|
2009-04-03 21:40:22 by Joerg Sonnenberger | Files touched by this commit (1) |
Log message:
Do *not* preserve file mode bits. The tarballs have 0777 permissions for
the directories and all implementations of tar but pax-as-tar honour
those when running as root.
|
2009-01-18 22:24:12 by Julio M. Merino Vidal | Files touched by this commit (3) | |
Log message:
Update to 0.42:
Changes
- The output of 'automate show_conflicts' has been changed; a
default resolution for file content conflicts and user resolutions
for other conflict types has been added. 'directory_loop_created'
changed to 'directory_loop'.
- The French, Brazilian-Portuguese and Japanese translations were
outdated and thus have been removed from the distribution. In case
you care about them and want them back, drop us a note at
monotone-devel@nongnu.org.
Bugs fixed
- 'mtn db kill_rev_locally' did not update the inodeprint
cache when executed from a workspace on which the
revision's changes where applied.
- Some recent performance issues have been corrected:
* since 0.40, there is much more use of hex encoding/decoding.
These functions have been sped up considerably.
* since 0.40, every command in an 'automate stdio' session
would reinitialize the database. This was rather slow, so
monotone will now keep the database open between commands.
- The Lua-based contributed Monotone extension introduced in
0.38 haven't been added to the tarball; this has been fixed.
- Monotone died if _MTN/options contained an empty / not-existing
'keydir' entry. This has been fixed. Also, invalid options are now
better detected and give a more useful error message.
- Monotone crashed if it was called with more than 2048 command
line arguments. This has been fixed.
- If vim is used as merger, it no longer prompts the user for an
enter key press.
- Decoding errors f.e. through to garbage from the network no longer
results in informative failures, but in warning. This was made
possible by introducing the concept of origin-aware sanity checks.
- Monotone crashed if it was called with nested wildcards such as
'a.{i.{x,y},j}'. This has been fixed.
- The standard implementation of the 'ignore_file' hook now accepts
windows and unix line endings in .mtn-ignore files.
New features
- New 'mtn ls duplicates' command which lets you list
duplicated files in a given revision or the workspace.
- New option --no-workspace, to make monotone ignore any
workspace it might have been run in.
- New command group 'mtn conflicts *'; provides asynchronous
conflict resolutions for merge and propagate.
- New 'automate file_merge' command which runs the internal line
merger on two files from two revisions and outputs the result.
- New 'automate lua' command with which lua functions, like
monotone hooks, can be called over automate. This is particularily
useful to get user defaults, like ignorable files, branch keys and
passwords, which are managed through one or more monotonerc files.
- New 'automate read_packets' command which reads data packets like
public keys similar to 'mtn read'.
- 'merge' and 'propagate' accept user commit messages; the
'merge rev rev' or 'propagate branch branch' message will be
prefixed to the user message. --no-prefix removes the prefix.
Internal
- Update Botan to 1.7.12.
|
2008-09-13 18:19:15 by Julio M. Merino Vidal | Files touched by this commit (1) |
Log message:
Add a test target.
|
2008-09-05 22:48:46 by Blair Sadewitz | Files touched by this commit (4) |
Log message:
Update to monotone-0.41.
pkgsrc-specific changes:
add REPLACE_SH for new bin/mtnopt shell script. Remove unneeded patch-aa;
the bug is no longer.
NEWS:
Changes
- 'mtn clone' now takes a branch argument rather than a branch
option which is more what people expect given the fact that
mtn push/pull/sync do not use a branch option either.
- 'mtn automate inventory' will show the birth revision for
any file that has been committed.
Bugs fixed
- If the options '--db' or '--keydir' were previously
specified for a command which was executed inside a
workspace and one or both option arguments were invalid
(f.e. invalid paths), they were still written to
_MTN/options of the particular workspace. This lead to
errors on any subsequent command which used these
options. This bug is fixed in so far that basic file type
checks are applied on both options, so its no longer
possible to set non-existing paths accidentally or use a
path to a directory as option argument for '--db'.
- If a key clash occurs on a netsync operation, i.e. two
different keys with the same key id are encountered, mtn now
fails cleanly and provides further guidance how to proceed.
- It was previously not possible to clone a branch / database
anonymously; this has been fixed.
- If the client tries to use an unknown key, try to fall back
to anonymous pull instead of failing immediately.
- 'mtn automate identify' was broken in 0.40 when used over
stdio, i.e. the output of the command did not get into the
right output channel; this has been fixed.
- Monotone would produce a warning if executed from the root
directory of a Windows drive; this has been fixed.
- The 'note_commit' hook now returns the new revision id
hex-encoded again - the bug was introduced in 0.40.
New features
- New 'mtn suspend' command which lets you mark certain
revisions and thus whole branches as discontinued
("suspended") by attaching a special suspend cert to the
revision. All relevant mtn commands (f.e. mtn heads,
mtn ls branches) honor this cert by default. To ignore it,
simply add '--ignore-suspend-certs' to your command line.
Suspended revisions can have children, which are in no
way affected by the cert of their parent, i.e. suspended
development lines or branches can simply be "unsuspended"
by committing to them.
This feature was already added in monotone 0.37, but was
forgotten to be mentioned in NEWS back then.
- New 'get_default_command_options' lua hook which lets you
specify default options for a given, triggered command.
Useful f.e. if you always want to have your 'mtn add'
command executed with '-R' / '--recursive'.
- Add 'automate show_conflicts' command.
- Add 'automate get_workspace_root' command.
- Add Lua hooks 'note_netsync_revision_sent',
'note_netsync_cert_sent' and 'note_netsync_pubkey_sent'.
|
2008-05-25 23:42:22 by Joerg Sonnenberger | Files touched by this commit (48) |
Log message:
Explicitly add pax dependency in those Makefiles that use it (or have
patches to add it). Drop pax from the default USE_TOOLS list.
Make bsdtar the default for those places that wanted gtar to extract
long links etc, as bsdtar can be built of the tree.
|
2008-04-29 22:26:47 by Daniel Carosone | Files touched by this commit (2) |
Log message:
you commit to cvs expecting it to work like monotone.
wizd hits you.
(redo previous while actually committing the patch as well)
|
2008-04-28 17:43:52 by Daniel Carosone | Files touched by this commit (2) |
Log message:
add changes from upstream to fix a regression in 0.40 with ssh-agent support,
these fixes will be in 0.41
bump revision
|
2008-04-12 16:34:50 by Julio M. Merino Vidal | Files touched by this commit (2) |
Log message:
Update to 0.40. Tested in NetBSD-current/amd64 and OS X 10.4.
Changes
- The vim merger has been improved and now uses diff3 to merge
non-conflict changes automatically before executing vimdiff.
- Values used with the --depth option used to control recursion with
node and path restrictions have changed. Using --depth=0 now means
exactly the specified directories and *not* their children. Using
--depth=1 now means the specified directories and their immediate
children. Previously --depth=0 included children and --depth=1
included grandchildren and it was not possible to exclude children
using --depth. The simple fix for anyone using --depth is to add 1 to
the values they are using.
- Document that ssh: and file: sync transports are not supported on
native Win32.
Bugs fixed
- `commit' now uses keydir specified in _MTN/options
- duplicate name conflicts now show a proper error message, even if
a parent directory got renamed as well. In that case, the error
message now shows both names for the directory and the offending
file name.
New features
- The bare parent selector 'p:' can now be used in a workspace to
query the parent(s) of the workspace' base revision. This is
equivalent to "mtn au select p:`mtn au get_base_workspace_revision`".
- push, pull, and sync can be run with a single argument, which looks
like
mtn://hostname?include_pattenr/-exclude_pattern
or
mtn://hostname?include=include_pattern/exclude=exclude_pattern
Internal
- Update Botan to 1.7.4.
- Usage of the internal app_state object has been reduced, objects
are better encapsulated now. The database interface has been
enhanced to ease reduction of locking contention in the future.
- Merged the two indexes on revision_certs into a single one.
- The database schema has been changed so that it now stores
binary SHA1 hashes rather than their hexadecimal encoding,
in most places where these are used. This reduces the
database size and speeds up operations a little.
Users who like to fiddle with the database directly are
advised to use the sqlite functions hex() and quote() to
print columns that store hashes (including IDs), and the
hexadecimal literal notation x'DEADBEEF' to input them.
- Binary SHA1 hashes are also used for most in-memory
processing, avoiding conversions and saving memory.
|
2008-02-27 15:16:50 by Julio M. Merino Vidal | Files touched by this commit (3) | |
Log message:
Update to 0.39:
Changes
- 'mtn di' is now an alias for 'mtn diff'.
- 'automate db_set' has been renamed to 'automate set_db_variable'.
- 'automate db_get' has been replaced by 'automate get_db_variables'
which returns all database variables similar to 'list vars' in
basic_io format, optionally restricted by domain.
- The REVID argument of 'automate get_revision' is now mandatory;
to retrieve the current workspace revision, use the new command
'automate get_current_revision'
- messages describing conflicts from all of the various merge commands
have been reworked and should be much more informative.
- mtn show_conflicts now outputs much more detailed and descriptive
messages, however it may report content conflicts that will be
resolved automatically by the line merger.
- The internal copy of PCRE has been updated to version 7.6.
If you use the '--with-system-pcre' configure switch, it
will insist on at least this version.
- "emacs" has been removed from the list of dumb terminal types;
tickers should now default to --ticker=count with emacs terminals
- extensive section on merge conflicts and ways to resolve them
added to the manual.
Bugs fixed
- for changes near the beginning of a file, mtn's unified diff
output sometimes contained too many leading context lines.
- the path handling of 'mtn revert' was improved and fixed two bugs:
now a restricted revert on a node "dir1/file1" reverts only the
content changes in "file1", but leaves renames of any of its
ancestor nodes untouched; furthermore, if "dir0/" was renamed to
"dir1" and "dir1/file1" was dropped, mtn now re-creates \
file1 at the
proper place ("dir1/") and leaves no missing files around because
of the non-existing "dir0/".
- a few changes needed to build with gcc 4.3.
New features
- 'automate drop_db_variables' which drops one database variable
(like the 'unset' command) or all variables within a given domain.
- 'automate inventory' now accepts the options '--no-ignored',
'--no-unknown', '--no-unchanged' and '--no-corresponding-renames'.
Please consult the monotone documentation for more information about
these new options.
In addition, 'automate inventory' no longer recurses into ignored
directories. The typical case of listing files that need attention
now runs at least four times faster.
- 'automate get_current_revision' which outputs the revision text of
changes in the current workspace
|