Re: [Monotone-devel] Sync, write/read-permissions and port-binding in WinXP

2007-11-15 Thread [EMAIL PROTECTED] 28
datallah wrote: On Nov 14, 2007 10:40 AM, [EMAIL PROTECTED] 28 [EMAIL PROTECTED] wrote: First question is: did I do this right? I'm not sure, because I only found one reference about this, around the mailing list. Official tutorial assumes we're not working on Windows. There isn't

Re: [Monotone-devel] Sync, write/read-permissions and port-binding in WinXP

2007-11-15 Thread [EMAIL PROTECTED] 28
datallah wrote: On Nov 14, 2007 10:40 AM, [EMAIL PROTECTED] 28 [EMAIL PROTECTED] wrote: First question is: did I do this right? I'm not sure, because I only found one reference about this, around the mailing list. Official tutorial assumes we're not working on Windows. There isn't

Re: [Monotone-devel] Sync, write/read-permissions and port-binding in WinXP

2007-11-15 Thread [EMAIL PROTECTED] 28
Markus Schiltknecht wrote: Looks right. You could even try port 80, monotone doesn't care. [ Nor do I think such restrictive firewalls are useful. ;-) ] If so, not knowing what kind of command my pal used, I guess he did something like this: mtn push -d hisdatabase.mtn myIPaddress

Re: [Monotone-devel] Mark merge for existence

2007-11-15 Thread Markus Schiltknecht
Hey William, William Uther wrote: As a first step I'd like to make a version of monotone that remembers the new 'existence' marks when the file exists (i.e. add existence marks to the current code without trying to remember them when a file is deleted - no it wont change anything, but it is

Re: [Monotone-devel] Sync, write/read-permissions and port-binding in WinXP

2007-11-15 Thread Richard Levitte
In message [EMAIL PROTECTED] on Wed, 14 Nov 2007 23:59:03 -0800 (PST), [EMAIL PROTECTED] 28 [EMAIL PROTECTED] said: Twain28 I was actually referring to the fact that I had to find out Twain28 for myself where I had to create the 'write-permissions' and Twain28 'read-permissions' files. The

Re: [Monotone-devel] Mark merge for existence

2007-11-15 Thread Markus Schiltknecht
Hey again, sorry, hit send by accident... William Uther wrote: cmd_merging.cc : CMD(merge) cmd_merging.cc : merge_two() merge.cc : interactive_merge_and_store() # loads the left right rosters and marks from db roster_merge.cc : roster_merge() merge.cc :

Re: [Monotone-devel] Mark merge for existence

2007-11-15 Thread William Uther
On 15/11/2007, at 7:49 PM, Markus Schiltknecht wrote: Hey William, William Uther wrote: As a first step I'd like to make a version of monotone that remembers the new 'existence' marks when the file exists (i.e. add existence marks to the current code without trying to remember them

Re: [Monotone-devel] Mark merge for existence

2007-11-15 Thread Matt Johnston
On Thu, Nov 15, 2007 at 09:57:50AM +0100, Markus Schiltknecht wrote: You've read and understand *-merge? Best sources here [1]. Can you expand on you concept of 'existince marks'? Existence marks already exist for attrs don't they - the difference being that attrs aren't deleted that often so

Re: [Monotone-devel] Mark merge for existence

2007-11-15 Thread Markus Schiltknecht
Hi, William Uther wrote: (which does not track merges). And try to get merging right for it. Um, if it does not track merges, how do you get merging right? Sorry, I was unclear here. There are two different cases: one is the sync vs async copy. The other problem you are trying to solve as

[Monotone-devel] Re: Mark merge for existence

2007-11-15 Thread Graydon Hoare
Matt Johnston wrote: On Thu, Nov 15, 2007 at 09:57:50AM +0100, Markus Schiltknecht wrote: You've read and understand *-merge? Best sources here [1]. Can you expand on you concept of 'existince marks'? Existence marks already exist for attrs don't they - the difference being that attrs aren't

Re: [Monotone-devel] Mark merge for existence

2007-11-15 Thread William Uther
On 16/11/2007, at 12:17 AM, Markus Schiltknecht wrote: Hi, William Uther wrote: (which does not track merges). And try to get merging right for it. Um, if it does not track merges, how do you get merging right? Sorry, I was unclear here. There are two different cases: one is the sync

Re: [Monotone-devel] Re: Mark merge for existence

2007-11-15 Thread William Uther
On 16/11/2007, at 8:17 AM, Graydon Hoare wrote: I would not worry, in general, about the persistence of ghosts or trimming their marks from the roster. Fir my first pass, that is exactly my approach. This is tricky enough code as it is, and it isn't an area where you want to make

Re: [Monotone-devel] Mark merge for existence

2007-11-15 Thread William Uther
On 15/11/2007, at 11:58 PM, Matt Johnston wrote: On Thu, Nov 15, 2007 at 09:57:50AM +0100, Markus Schiltknecht wrote: You've read and understand *-merge? Best sources here [1]. Can you expand on you concept of 'existince marks'? Existence marks already exist for attrs don't they - the

Re: [Monotone-devel] Re: Mark merge for existence

2007-11-15 Thread William Uther
On 16/11/2007, at 9:48 AM, William Uther wrote: A point you have to be sure to address throughout the tool is that you have to modify things that detect conflicting nodes by path, since paths can only have a unique *live* occupant. Change it such that eg. a/b/foo.txt and a/b/foo.txt only