Re: [Monotone-devel] Unresolved conflict, want to back out...

2006-10-26 Thread J Decker
Dealer_editor is a directory.  It exists within the same location in both versions (or would) ... full path is something like src/apps/milk/dealer_editorOn 10/26/06, Brian May <[EMAIL PROTECTED]> wrote: > "J" == J Decker writes:J> mtn.EXE: [source] 6c5472831fe23406d9107638185f72d7eb96c9e0

[Monotone-devel] ViewMTN 0.06 released

2006-10-26 Thread Grahame Bowland
Hi guys Just a quick note to say that ViewMTN 0.06 is out. Several minor bugs were found during testing of the last "preview"; in particular, 0.06 works correctly with newer versions of Cheetah templates, and I've ensured it still works with old versions. Grab it from the ViewMTN site: http://gr

Re: [Monotone-devel] Unresolved conflict, want to back out...

2006-10-26 Thread Brian May
> "J" == J Decker writes: J> mtn.EXE: [source] 6c5472831fe23406d9107638185f72d7eb96c9e0 J> mtn.EXE: [target] 530d500ad40b790d2ea1b0986fe1372032434863 J> mtn.EXE: warning: rename target conflict: nodes 2117, 2081, both want parent 1442, name dealer_editor J> mtn.EXE: warning:

[Monotone-devel] Unresolved conflict, want to back out...

2006-10-26 Thread J Decker
Here is a batch file which accomplishes the same thing I did.It creates a temp .db using mtn it generates a key called 'junk' which it sets up for itself.It starts by deleting the temp directory 'x' and the database ' temp.db' then starts fresh every time. Begin test.bat rmdir /s xdel temp.

[Monotone-devel] Unresolved conflict, want to back out...

2006-10-26 Thread J Decker
I have several branches.branch A is the 'trunk'branch B is one evolution from the trunkbranch C is a descendnat of branch A with a specific 'pluck' of changes between A and B applied .branch D is another development path of A mtn propagate branch.c branch.a  (update A to be the head of C with pluck

Re: [Monotone-devel] Summit brainstorming

2006-10-26 Thread Thomas Keller
Dirk Hillbrecht schrieb: Well, it says: "..and we might see whether I can host you.". So, Dirk, what does that include? Office rooms with WLAN? A place to sleep? I can offer office rooms in the city center of Hannover (5 min by foot from main station) with LAN (2 MBit/s in both directions)/WLAN

Re: [Monotone-devel] Summit brainstorming

2006-10-26 Thread Markus Schiltknecht
Hello Dirk, Dirk Hillbrecht wrote: I can offer office rooms in the city center of Hannover (5 min by foot from main station) with LAN (2 MBit/s in both directions)/WLAN and enough place for about 10 people. However, our office facilities themselves are not really sufficient for staying there ove

Re: [Monotone-devel] Summit brainstorming

2006-10-26 Thread Dirk Hillbrecht
Hi, > Well, it says: "..and we might see whether I can host you.". So, Dirk, > what does that include? Office rooms with WLAN? A place to sleep? I can offer office rooms in the city center of Hannover (5 min by foot from main station) with LAN (2 MBit/s in both directions)/WLAN and enough place fo

Re: [Monotone-devel] Summit brainstorming

2006-10-26 Thread Nathaniel Smith
On Thu, Oct 26, 2006 at 08:10:39PM +0200, Markus Schiltknecht wrote: > Hi, > > another question I came up with is, how to finance such a summit. I've > recently had the pleasure to attend the PostgreSQL 10th Anniversary > Summit. They already have quite a good commercial support. > > What about

Re: [Monotone-devel] Summit brainstorming

2006-10-26 Thread Markus Schiltknecht
Hi, another question I came up with is, how to finance such a summit. I've recently had the pleasure to attend the PostgreSQL 10th Anniversary Summit. They already have quite a good commercial support. What about monotone? Is there already something like a core team? Is it organized? How? Do

Re: [Monotone-devel] Summit brainstorming

2006-10-26 Thread Markus Schiltknecht
Nathaniel Smith wrote: The other possible advantage of Hannover is that Dirk Hillbrecht has said (on the wiki) that he might be able to provide working space there. Well, it says: "..and we might see whether I can host you.". So, Dirk, what does that include? Office rooms with WLAN? A place to

Re: [Monotone-devel] Summit brainstorming

2006-10-26 Thread Christof Petig
Ulf Ochsenfahrt schrieb: > Theres, three times Wuppertal, once Berlin, once Rostock, once Lübeck. Three times? Ups. That looks like it's an European center of monotone development >:-) And it sounds like we should be able to meet in person just for an evening any time we like. I'd happily invite