On Tue, 2007-06-26 at 00:54 +0400, Shkutkov Michael wrote:
> I've just made:
> mtn pull
> and
> mtn update
>
> mtn: fatal: std::logic_error:
> /home/lapo/packaging/tmp/monotone-0.34/paths.cc:294: invariant
> 'I(utf8_validate(utf8(path)))' violated
> mtn: this is almost certainly a bug in monoton
On Tue, 2007-06-26 at 08:28 +0200, Richard Levitte wrote:
> Awesome work! And, I have a couple of comments...
>
> In message <[EMAIL PROTECTED]> on Mon, 25 Jun 2007 20:00:49 -0500, Timothy
> Brownawell <[EMAIL PROTECTED]> said:
>
> tbrownaw> There are some
On Wed, 2007-06-27 at 17:03 -0700, Zack Weinberg wrote:
> On 6/22/07, Derek Scherger <[EMAIL PROTECTED]> wrote:
> > The profiles I have do seem to be pretty consistent in showing the
> > dir_map lookups at or near the top at around 8-10% of the total time. I
> > think Tim changed this to a "hybrid
On Thu, 2007-06-28 at 15:07 -0700, Zack Weinberg wrote:
> Performance testing on the file_path/split_path changes led me to
> thinking about node_id lookups. Some things I've noticed:
>
> regenerate_caches (on a monotone database) spends nearly seven percent
> of runtime in dynamic_cast<> impleme
So... I've just discovered a rather annoying bug in webhost, which is
that (1) is is possible to create a project with the empty name, and (2)
because deleting a project does "rm projects/$project/", deleting the
project with the empty name actually deletes things for *all* projects.
So, everythin
On Sun, 2007-07-08 at 12:05 -0500, Timothy Brownawell wrote:
> So... I've just discovered a rather annoying bug in webhost, which is
> that (1) is is possible to create a project with the empty name, and (2)
> because deleting a project does "rm projects/$project/", deletin
On Wed, 2007-07-11 at 07:27 -0500, Kelly F. Hickel wrote:
> Get the errors below building on solaris 10 with a just installed boost
> 1.34.0.
>
> Has anyone run into these? Any ideas?
There are some incompatible changes between Boost 1.33 and 1.34 .
Current mainline will work with Boost 1.34.
0
On Wed, 2007-08-01 at 15:44 -0700, Joe Brenner wrote:
> I've run into what is almost certainly just a beginner's problem with
> write permissions, and I was wondering if you folks like to see
> user-level questions here on this list.
Sure, go ahead.
> If not, where would be a better
> place to
On Thu, 2007-08-02 at 09:59 +1000, William Uther wrote:
> On 02/08/2007, at 7:28 AM, Nathaniel Smith wrote:
> > On Wed, Aug 01, 2007 at 02:14:04PM +0100, Bruce Stephens wrote:
> >> If you didn't produce the LF, then what would you do for parents (or
> >> other commands that can return more than one
On Wed, 2007-08-01 at 21:43 -0700, Joe Brenner wrote:
> I'm trying to get a simple monotone setup working over my internal
> network, and I'm seeing a permissions problem: I can get read access,
> but not write access. I've run out of ideas for things to check, and
> I'm looking for suggestions.
On Thu, 2007-08-02 at 18:27 -0600, Eoin Coffey wrote:
> Error Message:
>
> mtn: fatal: std::logic_error: paths.cc:307: invariant
> 'I(is_valid_internal(data()))' violated
You have a file named
libpurple/plugins/mono/\
, which monotone doesn't like (file names can't contain '\').
...we *really
On Sun, 2007-08-19 at 21:05 +1000, William Uther wrote:
> net.venge.monotone.contrib.usher
I think there are people using this, and I'm not aware of any
replacements.
--
Timothy
Free (experimental) public monotone hosting: http://mtn-host.prjek.net
__
On Sun, 2007-08-19 at 21:05 +1000, William Uther wrote:
> Hi all,
>
>Now that the suspend branch is merged, I thought it might be time
> to think about suspending some of these old branches we have lying
> about. My first thought was suspend anything that hasn't been
> touched this year
On Sun, 2007-08-19 at 02:32 +0200, Pavel Cahyna wrote:
> Hello,
>
> I have encountered an annoying problem whit pluck. I try to pluck two
> revisions. The first one adds a directory, possibly with some files. Pluck
> succeeds. Tse other revision adds a file under that directory. Pluck of
> this re
On Sun, 2007-08-19 at 14:45 -0400, Nicolas Ruiz wrote:
> Timothy Brownawell wrote:
> > On Sun, 2007-08-19 at 21:05 +1000, William Uther wrote:
> >> net.venge.monotone.contrib.usher
> >
> > I think there are people using this, and I'm not aware of any
> > r
On Sun, 2007-08-19 at 21:35 +0200, Richard Levitte wrote:
> In message <[EMAIL PROTECTED]> on Sun, 19 Aug 2007 14:08:37 -0500, Timothy
> Brownawell <[EMAIL PROTECTED]> said:
>
> tbrownaw> On Sun, 2007-08-19 at 14:45 -0400, Nicolas Ruiz wrote:
> tbrownaw> >
On Sun, 2007-08-19 at 17:04 -0600, Derek Scherger wrote:
> Timothy Brownawell wrote:
> > Here's a list of all nvm* branches, by whether they've been merged into
> > some other branch and the date on the latest head. I'd think that we
> > could also suspend
On Fri, 2007-08-24 at 10:47 -0400, Patrick Maheral wrote:
> I've run into a problem that will probably create a "non-content" conflict
> and hope someone can suggest a work-around.
>
> I am working on two projects, "A" and "B", where project "B" has branched
> off from project "A". I would like
On Fri, 2007-08-31 at 14:48 -0400, Ben Walton wrote:
> Hi All,
>
> I'm adding 2 options to montone. The first is a --daemon to be used
> by mtn serve as mentioned a few days back. This is very straight
> forward, but it raises the questions of what to do with logs...
>
> To that effect, I'm als
On Sat, 2007-09-01 at 12:55 +0100, Anthony Edward Cooper wrote:
> Hello all :-),
>
> We use Monotone at work, were using CVS, and we are very impressed
> with the system :-).
>
> A couple of questions if I may that I have been unable to get
> answers to...
>
> Background:
>
On Sat, 2007-09-01 at 16:32 +0100, Anthony Edward Cooper wrote:
> Timothy,
>
> Many thanks for your quick and complete reply :-) Just one thing if
> I may. You say `the branch epoch has to be unique for that branch' is
> that unique amongst all branch epochs or unique amongst the hash ids
>
On Sat, 2007-09-22 at 22:25 -0600, Pablo Delgado wrote:
> Someone recommended that I started working on something that I feel
> bothers me or I need. Well, one of thing I miss is the commit
> templating capability that cvs has. This feature allows the repository
> manager or project leader to esta
On Sun, 2007-09-23 at 17:45 +0200, Markus Schiltknecht wrote:
> Hello Pablo,
>
> I'm not quite sure what exactly the use case for such a template is. The
> example you gave is certainly not convincing:
>
> Pablo Delgado wrote:
> > Example:
> >
> > PR Number:
>
> A Purchase Requisition number?
On Sun, 2007-11-04 at 16:50 +, Anthony Edward Cooper wrote:
> Just thought you would like to know...
>
> I was testing my perl automate stdio library when I noticed some odd
> behaviour. My test database is the one from monotone.ca, synced using
> mtn version 0.35. What I have seen:
>
On Sun, 2007-11-04 at 19:13 +0100, Richard Levitte wrote:
> Hey,
>
> I just saw that another case when someone created two keys with the
> same key id on the IRC log. While those mistakes are a bit
> frustrating in themselves, what's even more frustrating is that the
> signatures from one of the
On Mon, 2007-11-05 at 00:33 -0800, Nathaniel Smith wrote:
> On Sun, Nov 04, 2007 at 07:55:10PM -0600, Timothy Brownawell wrote:
> > Could we also handle this by making process_data_command error() on
> > data_exists for a key item? I believe all keys are sent before any certs
&
On 04/09/2015 01:23 PM, Markus Wanner wrote:
Hi,
On 03/30/2015 08:48 PM, Markus Wanner wrote:
To argue a bit more objectively: I tried to make the default colors
readable on black as well as white background. And I reduced noise a bit
by un-coloring a couple of things. Colorization can be adjus
On 04/12/2015 01:59 PM, Markus Wanner wrote:
Other colorized commands will output the colorization codes if
specifically asked, even to pipes.
That in turn surprises me.
$ mtn diff --colorize | cat
gives monochrome output for me. What specific command and OS do you use?
Oops, I meant "o
On 04/13/2015 03:02 AM, Markus Wanner wrote:
That's a use case. Have --pager be a GUI program (notepad, whatever),
which doesn't output thru your terminal. In which case you probably want
it *especially* if your terminal isn't smart.
Such a program would need to be able to read from stdin, but n
mtn-host.prjek.net has been unmaintained for far too long, and is almost
unused (no more than 5 projects touched this year). I'll be making it
read-only in mid-November, and then taking it the rest of the way down
at the end of the year.
___
Monotone
On 11/21/2015 07:47 PM, Hendrik Boom wrote:
Where does usher documentation hide out now?
It's in doc/documentation.html . I don't know that this is available
online anywhere other than thru viewmtn.
I'm specfically looking to fine out how to get usher to reread the
configuration file.
It trie
On 11/27/2015 07:03 AM, Hendrik Boom wrote:
I'm specfically looking to find out how to get usher to reread the
configuration file.
It tries to be a good Unix daemon, and catches SIGHUP for this. There's
also a command thru usherctl.
Either it didn't work, or I don't know how to SUGHUP.
I tried
On Thu, 2016-01-21 at 19:25 -0500, Hendrik Boom wrote:
> In all the examples I've seen, in the read permissions file I get to
> use a pattern to specify which branches users are allowed to read.
>
> But there seems to be no such pattern in the write permissions file.
>
> Is there a reason for t
a blank lines with the "none" ticker.
Comments, suggestions?
Timothy Brownawell
#
# patch "ui.cc"
# from [bf5397526968d5189f12fef56ecd4990f622beef]
#to [0c88eff67377902b972de5a9bf1f8df56e3a56b1]
#
# patch "ui.hh"
# from [7cdd4335a8fa4b4828470eb69b363792bd0a5ce
On 4/19/05, K. Richard Pixley <[EMAIL PROTECTED]> wrote:
> Jon Bright wrote:
> >Hi,
> Hey. :-).
>
>
> > > To provide globally unique serials, one would need to include some
> > > representation of the location at which an event occurred.
> > It's an idea that's been considered, but has a n
Argh. Forgot to set To: field to the list, instead of just Richard.
Tim
-- Forwarded message --
From: Timothy Brownawell <[EMAIL PROTECTED]>
Date: Apr 20, 2005 3:07 PM
Subject: Re: [Monotone-devel] another newbie question - nonlinear ordering
To: "K. Richard Pixl
On 4/20/05, Joel Reed <[EMAIL PROTECTED]> wrote:
> On Wed, Apr 20, 2005 at 08:10:23PM +0100, Bruce Stephens wrote:
>
> snip.
>
> > The other useful property doesn't seem to be something you're
> > attacking, but I seem to remember graydon came up with some local tree
> > numbering that would offe
On 4/21/05, Richard Levitte - VMS Whacker <[EMAIL PROTECTED]> wrote:
> In message <[EMAIL PROTECTED]> on 21 Apr 2005 08:55:04 -0700, Emile Snyder
> <[EMAIL PROTECTED]> said:
>
> esnyder> I see, you would also like to either remove the
> esnyder> accept_testresult_change() hook call, or redefine t
On 4/21/05, solo turn <[EMAIL PROTECTED]> wrote:
>
> is there a chance that monotone will support delta-v http extension?
I wasn't aware that it used http at all...
Tim
___
Monotone-devel mailing list
Monotone-devel@nongnu.org
http://lists.nongnu.org
Here's a patch that gets rid of the blank lines with the "none" ticker.
It adds a tick_writer::clear_line() function, that finish_ticking and
ensure_clean_line use instead of writing a line-end directly.
Tim
#
# patch "ui.cc"
# from [bf5397526968d5189f12fef56ecd4990f622beef]
#to [b06e19535d
On 4/24/05, Jared Williams <[EMAIL PROTECTED]> wrote:
>
> Hi,
> Seems a commit without a message caused a problem. Doing a simple
> minor commit..
>
> >monotone commit
> monotone: beginning commit on branch 'store'
> monotone: fatal: std::exception: boost::filesystem::path: invalid name
Forgot to set this to go to the list. Blah.
On 4/26/05, Richard Levitte - VMS Whacker <[EMAIL PROTECTED]> wrote:
> Hi,
>
> I've done quite a few merges and propagates from net.venge.monotone to
> net.venge.monotone.command-specific-options in the last few days, and
> found it a bit weird that the
On 4/26/05, Richard Levitte - VMS Whacker <[EMAIL PROTECTED]> wrote:
> In message <[EMAIL PROTECTED]> on Tue, 26 Apr 2005 23:06:02 +0200 (CEST),
> Richard Levitte - VMS Whacker <[EMAIL PROTECTED]> said:
>
> richard> Funny thing is, 'monotone lca' seems to get it right:
> richard>
> richard> : ;
I've been playing with profiling, and have some callgraph profiles
that might be useful. I used --callgraph=10 for these. I also tried
with higher numbers, and got percentages over 100.
Files are at https://netfiles.uiuc.edu/brownawe/www/profiles/ , here's
a few excerpts:
Pull / serve net.venge.m
On 5/1/05, Nathaniel Smith <[EMAIL PROTECTED]> wrote:
[...]
> Here's another pathological case for 3-way merge:
>A
>|
>B
> / \
> C D
> [...]
> So, clearly, picking A as an ancestor in the above graph is terrible.
>
> This leaves us in a bad situation, though. The possibility of
>
On 5/2/05, Henrik Holmboe <[EMAIL PROTECTED]> wrote:
> Nathaniel Smith <[EMAIL PROTECTED]> writes:
> [...]
> >It's true this a little confusing, though. Easiest solution: add a
> >"--do-it" command-specific-option to drop/rename, which tells them to
> >actually delete or rename the file in questio
On 02 May 2005 14:36:41 +0200, Peter Simons <[EMAIL PROTECTED]> wrote:
> Hi,
>
> I've run into the following problem: I start my monotone
> Netsync server using a separate user id: 'monoserv'. When I
> do so while being in a current working directory which is a
> monotone repository though, I get
On 5/7/05, Nathaniel Smith <[EMAIL PROTECTED]> wrote:
> On Sat, May 07, 2005 at 12:25:16AM -0500, Timothy Brownawell wrote:
> > It's trying to read MT/options. Since anything in this file can be put
> > on the command line (so it's not critical to be able to read th
Pull can take a long time to sanity-check revisions (especially on
initial pull to a fresh db), and doesn't provide any feedback during
this. This patch lets packet_consumer and children run a callback when
a revision is written out. Netsync then uses this to add a ticker for
revisions written. Is
There've been some requests for a way to run multiple automate commands
without needing a new monotone process for each. There's now a new
command, "monotone automate stdio" that takes automate commands on
stdin. Currently, it prefixes the output of each command with the line
"###BEGIN ###" and fol
On 5/17/05, Joel Crisp <[EMAIL PROTECTED]> wrote:
> Yep, a number at the beginning of each line. It lets you detect the start of
> the next header, distinguish different types of output
> easily, handle optional or repeated blocks of output etc. It also allows you
> to detect badly or prematurely
On 5/15/05, Joel Crisp <[EMAIL PROTECTED]> wrote:
> Hi
>
> Just a small comment; maybe a format using the numeric prefix familiar to us
> all from RFCs like
>
> 200 OK UNKNOWN test/foo
> 201 foo.h
> 201 foo.c
>
> etc.
>
> This format is more likely to be parsable with existing libraries and is
On 5/18/05, Jerome Fisher <[EMAIL PROTECTED]> wrote:
> This strikes me as bad for the obvious reason that the delimiters
> appearing in the command output would mess things up. You'd need to
> ensure that user data (such as filenames, cert keys and values, cats and
> diffs) are never inserted in su
On 5/18/05, Nathaniel Smith <[EMAIL PROTECTED]> wrote:
> I also haven't looked at how this parses the strings that are written
> to stdin to get a command out, but I suspect that similar tricks would
> be a good idea. Maybe make the format the constant "l", then a bunch
> of argument
> strings, t
On 5/19/05, Sebastian Spaeth <[EMAIL PROTECTED]> wrote:
> >>> Just a small comment; maybe a format using the numeric prefix
> >>> familiar to us all from RFCs like
> >>>
> >>> 200 OK UNKNOWN test/foo
> >>> 201 foo.h
> >>> 201 foo.c
>
> I know it makes sense to add something like this in general.
>
On 5/19/05, Wim Oudshoorn <[EMAIL PROTECTED]> wrote:
>
> If you have the following revision graph:
>
>A
> /|\
> B C D
> / / \ \
>/ E F \
> / / \ \
>
On 5/19/05, Nathaniel Smith <[EMAIL PROTECTED]> wrote:
> On Wed, May 18, 2005 at 07:13:11PM -0500, Timothy Brownawell wrote:
> > It uses operator>>(istream, string) . So items are whitespace
> > separated, and whitespace is ignored.
>
> Not so good; items cou
On 5/20/05, Nathaniel Smith <[EMAIL PROTECTED]> wrote:
> On Fri, May 20, 2005 at 10:36:32AM -0500, Timothy Brownawell wrote:
> > How about a series of colon items, like we were
> > thinking for the output?
> > 7:parents40:0123456789abcdef0123456789abcdef01234567
&g
Input for monotone automate stdio now has the format
'l'':'[':'...]'e'
, as there were problems mentioned with the previous format. Characters
between the 'e' for one command and the 'l' for the next are ignored
(except for 'l', of course).
Output now has the format
':'':'':'':'
, where cmdnum is
On Wed, 2005-05-25 at 21:46 -0700, Nathaniel Smith wrote:
> On Wed, May 25, 2005 at 09:45:53AM +0200, Christof Petig wrote:
> > while dusting off the ssh (and serve stdio) branch I realized that all
> > these works need a common infrastructure: The ability to
> > (cross-platform!) deal with pipes.
Netsync can now use regex matching against branch names. Cross-branch
ancestor syncing also works now.
Netsync commands can now take either a "collection" (like before) or a
"/regex/", both of which are converted to "regex" by the netsync code.
(collection is escaped and has ".*" appended, /regex/
On Fri, 2005-05-27 at 15:54 -0400, Nathan Cournia wrote:
> Hi,
>
> I've just started to use monotone and have some questions.
>
> 1. Should I maintain each project I'm working on in a seperate .db file
I believe this is considered the "right" way to do things, yes.
> 2. If I do keep each proj
On Tue, 2005-05-31 at 06:00 +0200, Richard Levitte - VMS Whacker wrote:
> I just noticed the new note_netsync_{revision,cert,pubkey}_received
> callbacks, and my immediate response is "Cool!".
>
> Timothy, you're bringing monotone to a new level of functionality!
> Thank you!
Cool. :) It's so nic
> tbrownaw: are you interested in fully converting
> netsync over to regexes, i.e. kill the concept of
> "collection" entirely?
Collections are now completely gone. The syntax for netsync commands is
now "sync regex", rather than "sync /regex/". Also, the
get_netsync_*_permitted hooks now get ind
On Wed, 2005-06-01 at 13:07 +0200, Peter Simons wrote:
> > This makes netsync incompatible with previously
>
> How do I update the net.venge.monotone branch now? The
> repository at off.net doesn't want to talk to me. Is there
> another server?
You keep an old version around until the server is
On Wed, 2005-06-01 at 17:32 +0200, Peter Simons wrote:
> Timothy Brownawell writes:
>
> > You keep an old version around until the server is
> > updated.
>
> Alright.
>
> Is there any chance of getting support for "not" matches? So
> that I could
On Thu, 2005-06-02 at 08:36 -0500, Jordan Breeding wrote:
> Hello,
>
> I just recently updated my monotone repo and tried to recompile. Your regex
> changes seem to have broken my compiler. I know that a few days ago I was
> able to compile all of monotone so I don't think that it is the compi
On Sun, 2005-06-05 at 17:53 -0400, Michael Stone wrote:
> I'm attempting to give people a clean way to mark a revision as
> "no-longer-a-head-for-branch-X". There are two use cases for a feature
> like this one:
>
> 1) To ignore old branches which have subsequently been merged into the
> mainline
On Mon, 2005-06-20 at 19:31 -0400, Antony Trupe wrote:
>
>
> On 6/11/05, Bram Cohen <[EMAIL PROTECTED]> wrote:
> Antony Trupe wrote:
> > -Would I be writing a tool to use an existing implementation
> of the
> > merge algorithm, or writing a tool that itself impleme
On Mon, 2005-06-27 at 18:37 -0400, Hendrik Boom wrote:
[snip]
> So if I generate any key in a database, that key becomes the default?
> And adding a key with
>monotone ... read <...
> doesn't make a default key?
No, it guesses the default whenever it only has one private key to
choose from
On Fri, 2005-07-01 at 19:44 +0200, Johan Bolmsjo wrote:
> Hello,
>
> Don't know if this is really a bug but monotone thinks so.
No, just a bad error message.
> I was pulling the monotone sources like this to host 'vargen':
> monotone --key="" pull off.net net.venge.monotone
>
> At the same time
On Thu, 2005-07-07 at 11:47 +0200, Peter Simons wrote:
> Nathaniel Smith writes:
>
> >> | pull [ADDRESS[:PORTNUMBER] [PATTERN]]
>
> > It's a shell pattern. (It was a regex for a while during
> > development, so it's an outdated message.)
>
> One feature I depended on is the ability to negat
On Thu, 2005-07-07 at 11:25 -0500, Brian Downing wrote:
> On Thu, Jul 07, 2005 at 10:17:58AM -0500, Timothy Brownawell wrote:
> > > With (Boost's) regular expressions, I could say
> > >
> > > foo\.(?!bar)\.*
> > >
> > > to match, say &quo
On Fri, 2005-07-22 at 15:40 +0200, Rene Wagner wrote:
> I'd be happy to provide the monotone db in question as requested in
> [2]. However, Justin has already provided a copy of a db exposing
> the bug in [3].
>
> I'd appreciate any type of feedback from a core developer as this
> type of random b
On Tue, 2005-08-02 at 09:58 -0700, Todd A. Jacobs wrote:
> On Mon, Aug 01, 2005 at 07:29:05PM -0600, Derek Scherger wrote:
>
> >there's really no concept of "which repository a file comes from." if
> >you and I have version b632c7b9bda8e2df8b392b3606d554398e6ddb97 of some
> >file, then it is assum
On Wed, 2005-08-03 at 09:56 -0700, Justin Patrin wrote:
> 2) You have different branches in each DB and are propagating between
> them while not syncing all branches to all servers. In this case it
> may be possible (I haven't tested this) to have a propagate from one
> branch show up in one DB wh
On Wed, 2005-08-03 at 10:47 -0700, Justin Patrin wrote:
> However you can specify certain branches to serve (on the server side)
> and certain branches to pull on the client side. If you set up 1 of 2
> branches for serving but have propagated from one to the other will
> the server still send the
On Sat, 2005-08-06 at 02:08 -0700, Nathaniel Smith wrote:
> 1) whenever a user explicitly sets the value, they express a claim
> that their setting is superior to the old setting
This claim is "in revision XXX, the value is set to 'a', overriding the
values set in revisions {YYY, ...}".
>
On Sun, 2005-08-07 at 01:06 -0700, Nathaniel Smith wrote:
> On Sat, Aug 06, 2005 at 02:05:43PM -0500, Timothy Brownawell wrote:
> > On Sat, 2005-08-06 at 02:08 -0700, Nathaniel Smith wrote:
> > > 1) whenever a user explicitly sets the value, they express a claim
> > >
Concerning tests/t_merge_binary.at:
Revision f550 has a left ancestor db0b and a right ancestor f2ed, with a
common ancestor 734c3. (This is neither the lca (64c8) nor the lcad
(7f84).)
>From 734c3 to db0b, and from db0b to f550 there is no change.
>From 734c3 to f2ed, it is deleted, and from f2ed
The default testresult hook makes testresult certs basically useless.
The current hook is:
function accept_testresult_change(old_results, new_results)
for test,res in pairs(old_results)
do
if res == true and new_results[test] ~= true
then
return false
end
end
On Thu, 2005-08-18 at 01:24 +0200, Richard Levitte - VMS Whacker wrote:
> In message <[EMAIL PROTECTED]> on Wed, 17 Aug 2005 12:40:35 -0700, Nathaniel
> Smith <[EMAIL PROTECTED]> said:
>
> njs> Fine by me for now. The better solution is to let people define
> njs> per-MT which tests they want to
Prerequisite:
http://thread.gmane.org/gmane.comp.version-control.monotone.devel/4297
A user can make 2 types of merge decisions:
(1): One parent is better than the other (represented by *)
(2): Both parents are wrong (represented by ^)
Since there are 2 types of merge decisions, it would be bad
On Wed, 2005-08-24 at 09:38 +0200, Christof Petig wrote:
> Any idea on how to merge the changes in mainline (propagated to
> nvm.cvssync.win32) into net.venge.monotone.cvssync?
>
> When doing an explicit merge:
>
> mt explicit_merge 7b88f7c9b843cae0b068b5232edf812c9b2b367d
> 0772ad08e5a0c6593219f
On 9/1/05, Bruce Stephens <[EMAIL PROTECTED]> wrote:
> Bruce Stephens <[EMAIL PROTECTED]> writes:
>
> [...]
>
> > % cat MT/revision
> > 8f5dd295d896c8937622b9ebcae3bb61c0a2e0e5
> > (This is of net.venge.monotone.)
> > % monotone cat manifest | grep vocab.cc
> > ceb
On Tue, 2005-09-13 at 18:59 +0200, Lapo Luchini wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA1
>
> Hi there.
> Each time I decide to version a binary or executable file I wonder: is
> there a specific reason to put the attributes in a .mt-attrs file in the
> same directory of the referen
On Wed, 2005-09-14 at 08:48 +0100, Andy Jones wrote:
> > If you're
> > working, for instance, in a console or terminal-based session and do
> > not have access to a mouse, consider using the application screen(1).
> > You can perform a copy-and-paste operation using a few meta-key
> > combinations
On Thu, 2005-09-15 at 06:58 +0200, Richard Levitte - VMS Whacker wrote:
> In message <[EMAIL PROTECTED]> on Thu, 15 Sep 2005 04:05:02 UT, [EMAIL
> PROTECTED] said:
>
> monotone> ChangeLog:
> monotone>
> monotone> 2005-09-14 Timothy Brownawell <[EMAIL P
Hi,
I'm trying to implement ~/.monotone/keys/ . Since a privkey without its
pubkey isn't very useful, I want to make it store key pairs, not lone
privkeys. In order for this to work, monotone would have to not be able
to input a private key without its pubkey.
So, I'd like to *replace* the 'privk
On Tue, 2005-09-20 at 16:39 -0500, Timothy Brownawell wrote:
> Hi,
>
> I'm trying to implement ~/.monotone/keys/ . Since a privkey without its
> pubkey isn't very useful, I want to make it store key pairs, not lone
> privkeys. In order for this to work, monotone would
On Wed, 2005-09-21 at 10:01 +0200, Richard Levitte - VMS Whacker wrote:
> In message <[EMAIL PROTECTED]> on Tue, 20 Sep 2005 22:45:07 -0500, Timothy
> Brownawell <[EMAIL PROTECTED]> said:
>
> tbrownaw> On Tue, 2005-09-20 at 16:39 -0500, Timothy Brownawell wrote:
This (keystore, keypair packets) is now commited in branch
net.venge.monotone.keys . It still should get a db migrate (to remove
the privkey table), which would require that the migrate function have
access to more than just the db.
On Tue, 2005-09-20 at 16:39 -0500, Timothy Brownawell wrote
Hi,
There's a new GUI tool (c++ using gtkmm) in the .contrib.mtsh branch,
for dealing with working copies.
It shows a list of files and can be used to change file states (add,
drop, rename, revert), and to select/deselect changed files for commit.
It also shows file diffs, file contents, and file
On Tue, 2005-09-27 at 15:11 +0200, Leif Jakob wrote:
> Hi,
>
> I just run in a mysterious problem:
>
> [EMAIL PROTECTED]:$ monotone --db=empty.db heads -b SomeClosedSourceBranch
> monotone: branch 'SomeClosedSourceBranch' is currently merged:
> e837f7ee40be350cdb73d30c890968c9aba3f5f9 [EMAIL PROT
On Tue, 2005-09-27 at 07:07 -0700, Larry Hastings wrote:
> Let me be clear: I am hardly opposed to changing these tags to custom
> certs. Indeed, that could offer its own advantages. But I am curious
> about the reaction of the general monotone community. I am now well
> acquainted with Mr. Levi
On Tue, 2005-09-27 at 17:00 +0200, Richard Levitte - VMS Whacker wrote:
> In message <[EMAIL PROTECTED]> on Tue, 27 Sep 2005 09:48:32 -0500, Timothy
> Brownawell <[EMAIL PROTECTED]> said:
>
> tbrownaw> ...actually, if we had a convenient way to list arbitrary
> t
On Wed, 2005-09-28 at 22:06 -0400, Faré wrote:
> I publish a write-up of my experience with monotone:
>http://www.livejournal.com/users/fare/95424.html
>
> Can you explain to me why the output of monotone has this weird
> newline without a carriage return?
Where? I think the only slightly un
On Wed, 2005-10-12 at 01:17 +0200, Wim Oudshoorn wrote:
> When I server all branches with
>
> monotone serve 0.0.0.0 *
>
> I can not sync from other computers, I get an error
> something like:
>
> access denied due to branch xxx.yyy
>
> Using monotone version 0.23.
> Is this known?
Your shell
On Sun, 2005-10-16 at 13:12 +0200, Richard Levitte - VMS Whacker wrote:
> In message <[EMAIL PROTECTED]> on Sun, 16 Oct 2005 10:07:36 UT, [EMAIL
> PROTECTED] said:
>
> monotone> ChangeLog:
> monotone>
> monotone> 2005-10-16 Timothy Brownawell <[EMAIL PROT
Hi,
The get_netsync_*_permitted hooks now have default definitions, which
read $confdir/{read,write}-permissions .
write-permissions is a list of allowed keys, one per line, with
"--all--" meaning to allow access to everyone whose pubkey we have,
including anonymous readers.
read-permissions loo
501 - 600 of 691 matches
Mail list logo
