Re: [Monotone-devel] [PATCH] and RFC: binary files merging and hook

2005-05-31 Thread Glen Ditchfield
On Tuesday 31 May 2005 00:27, rghetta wrote: > Even with the add-time hook you need two functions: one for the add > hook, to mark those files you don't want merged by monotone internal > algorithm, another for choosing wich merge tool to use. Why can't there be one function that examines the files

Re: [Monotone-devel] invariant 'I(b.rearrangement.deleted_files.empty())' violated

2005-05-31 Thread Alvaro Herrera
On Tue, May 31, 2005 at 06:05:03PM -0700, Nathaniel Smith wrote: > If you don't only need to import CVS mainline, not any CVS branches, > then you might have better luck with either the > "net.venge.monotone.cvssync" branch, which is a still-in-development > effort to add CVS client capabilities t

Re: [Monotone-devel] Why?

2005-05-31 Thread Richard Levitte - VMS Whacker
In message <[EMAIL PROTECTED]> on Tue, 31 May 2005 17:59:22 -0700, Nathaniel Smith <[EMAIL PROTECTED]> said: njs> On Mon, May 30, 2005 at 05:12:14PM +0200, Richard Levitte - VMS Whacker wrote: njs> > : ; ./monotone checkout --help njs> > Usage: monotone [OPTION...] command [ARGS...] nj

Re: [Monotone-devel] enhancements to monotone auto-completion modules

2005-05-31 Thread Joel Reed
On Tue, May 31, 2005 at 05:49:53PM -0700, Nathaniel Smith wrote: > On Mon, May 30, 2005 at 11:21:23PM -0400, Joel Reed wrote: > > I'm thinking thru some enhancements to monotone's zsh auto-complete module, > > and wanted to bounce a few ideas around on the mailing list. > > > > When completing "mt

Re: [Monotone-devel] invariant 'I(b.rearrangement.deleted_files.empty())' violated

2005-05-31 Thread Nathaniel Smith
On Tue, May 31, 2005 at 11:30:10AM +0200, Wolfgang Denk wrote: > Hi, > > I was trying to import our Linux Kernel Tree from CVS into MT and ran > into this problem: > > -> time monotone --db=linuxppc_2_4_devel.db --branch=de.denx cvs_import > CVS-REPO/linuxppc_2_4_devel > enter passphrase for key

Re: [Monotone-devel] enhancements to monotone auto-completion modules

2005-05-31 Thread Joel Reed
On Mon, May 30, 2005 at 11:21:23PM -0400, Joel Reed wrote: snip > How to choose? The following output might help a bit more: > > 0f38758e62f8e42828f64bda2a6d6e8c0ebff053 - 2004-04-23 13:30:11 > 0f686b12985260ec9fa1d95034f3dbc0ed3299b7 - 2004-12-24 10:50:55 > 0fd1e57fda300f1794e0ff60b05ca7034e9db

Re: [Monotone-devel] Why?

2005-05-31 Thread Nathaniel Smith
On Mon, May 30, 2005 at 05:12:14PM +0200, Richard Levitte - VMS Whacker wrote: > : ; ./monotone checkout --help > Usage: monotone [OPTION...] command [ARGS...] > [...] > Options specific to 'monotone checkout': >-b, --branch=STRING select branch cert for operation

Re: [Monotone-devel] enhancements to monotone auto-completion modules

2005-05-31 Thread Nathaniel Smith
On Mon, May 30, 2005 at 11:21:23PM -0400, Joel Reed wrote: > I'm thinking thru some enhancements to monotone's zsh auto-complete module, > and wanted to bounce a few ideas around on the mailing list. > > When completing "mt dropkey ...", we can present a somewhat helpful > list of keys and the cor

[Monotone-devel] invariant violated error

2005-05-31 Thread Vladimir Vukicevic
Howdy, I was just doing a monotone update (I'm keeping a local tree of the mozilla repository, with local branches for my work), and I received this: ... monotone: updating toolkit/mozapps/extensions/content/extensions.js to ff55bd4af111aef8fdd42f7b57b19645ea22148c monotone: updating toolkit/moza

Re: [Monotone-devel] monotone.cvssync: Invariant failure

2005-05-31 Thread Tobias Hunger
On Tuesday, 31. May 2005 17:06, Christof Petig wrote: > I checked and it looks like this problem is solvable (I do have to think > about the internal handling of modules though ...): > > monotone: readline result 'Module-expansion src/sim' > monotone: readline result 'Module-expansion src/cpu' > mo

[Monotone-devel] collections are gone; netsync version bumped

2005-05-31 Thread Timothy Brownawell
> 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

Re: [Monotone-devel] monotone.cvssync: Invariant failure

2005-05-31 Thread Christof Petig
Tobias Hunger schrieb: > On Monday, 30. May 2005 18:27, you wrote: > >>Unless someone comes up with a really smart idea on how to detect this >>(does list-modules give any hint (--debug output)?) I do not see how to >>work around this problem (interesting to see how cvs manages this in its >>Entrie

Re: [Monotone-devel] monotone.cvssync: Invariant failure

2005-05-31 Thread Christof Petig
Christof Petig schrieb: >>Yes, exactly! But here the module is a file and not a directory, so that >>mechanism fails. > > > :-( > >>>I could not come up with a less error prone procedure to get a list of >>>both active and dead files. >> >> >>I do not know anything better either and in fact the sys

[Monotone-devel] Re: invariant 'I(b.rearrangement.deleted_files.empty())' violated

2005-05-31 Thread Wolfgang Denk
Hi, I wrote earlier: > I was trying to import our Linux Kernel Tree from CVS into MT and ran > into this problem: > > -> time monotone --db=linuxppc_2_4_devel.db --branch=de.denx cvs_import > CVS-REPO/linuxppc_2_4_devel > enter passphrase for key ID [EMAIL PROTECTED]: > monotone: [branches: 3]

[Monotone-devel] Documentation in debian package 0.19

2005-05-31 Thread Zbynek Winkler
Hello! The debian package http://venge.net/monotone/downloads/monotone_0.19-1_i386.deb contains documentation (installed under /usr/share/doc/html/) but the pngs from figures/* are missing. Zbynek -- http://zw.matfyz.cz/ http://robotika.cz/ Faculty of Mathematics and Physics, Charles Un

[Monotone-devel] invariant 'I(b.rearrangement.deleted_files.empty())' violated

2005-05-31 Thread Wolfgang Denk
Hi, I was trying to import our Linux Kernel Tree from CVS into MT and ran into this problem: -> time monotone --db=linuxppc_2_4_devel.db --branch=de.denx cvs_import CVS-REPO/linuxppc_2_4_devel enter passphrase for key ID [EMAIL PROTECTED]: monotone: [branches: 3] [versions: 43004]