[Monotone-devel] Merging outside monotone?

2005-10-09 Thread Wim Oudshoorn
After using monotone for a while I am becoming of the opinion that the current merging behaviour is not very user friendly. The problems I have come down to three problems, in various degrees of annoyances 1) The necessity of having a merge tool. 2) The fact that one mistake in merging can

[Monotone-devel] Re: Merging outside monotone?

2005-10-09 Thread Lapo Luchini
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Wim Oudshoorn wrote: If instead of the current mechanism it would be possible to have something like This is scary: believe or not I was just about to propose something close to that myself =) (that is: FWIW I completely agree about the proposal)

Re: [Monotone-devel] Re: monotone setup failure

2005-10-09 Thread Peter Portante
FYI: Mistyping a - gives the following error: [frodo:Personal/School/CSG280] portante% monotone db init -db=./temp.db monotone: misuse: monotone db doesn't use the option --branch On 10/8/05 4:29 PM, Nathaniel Smith [EMAIL PROTECTED] wrote: On Sat, Oct 08, 2005 at 02:42:05PM -0400,

Re: [Monotone-devel] Merging outside monotone?

2005-10-09 Thread Matthew A. Nicholson
Wim Oudshoorn wrote: After using monotone for a while I am becoming of the opinion that the current merging behaviour is not very user friendly. The problems I have come down to three problems, in various degrees of annoyances 1) The necessity of having a merge tool. 2) The fact that one

[Monotone-devel] Broken monotone 0.19 database

2005-10-09 Thread Glen Ditchfield
I have a monotone database, used with monotone 0.19, that now gives me invariant violation messages. To complicate matters, I ran monotone db update with monotone 0.23 in my working directory, without saving the MT directory. Fortunately nothing irreplacable is in the database, but if

Re: [Monotone-devel] Broken monotone 0.19 database

2005-10-09 Thread Nathaniel Smith
On Sun, Oct 09, 2005 at 10:48:19PM -0500, Glen Ditchfield wrote: I have a monotone database, used with monotone 0.19, that now gives me invariant violation messages. To complicate matters, I ran monotone db update with monotone 0.23 in my working directory, without saving the MT directory.

Re: [Monotone-devel] Bug in annotate, renamed files?

2005-10-09 Thread Emile Snyder
Is this in a project that you could let me see, or proprietary code? It would make it much easier to debug if I could do a pull of your project db. thanks, -emile On Sun, 2005-10-09 at 14:55 +0200, Wim Oudshoorn wrote: In one project containing 3 files the command monotone annotate file

[Monotone-devel] Re: Bug in annotate, renamed files?

2005-10-09 Thread Wim Oudshoorn
Emile Snyder [EMAIL PROTECTED] writes: Is this in a project that you could let me see, or proprietary code? It would make it much easier to debug if I could do a pull of your project db. Fortunaly this happens in one of my smaller databases. I can give you access to my database, but I