[Monotone-devel] Re: monomercurial sync

2007-04-17 Thread Bruce Stephens
Lapo Luchini [EMAIL PROTECTED] writes: Sooner or later there has to be a monotone-mercurial bidirectional sync tool and, given the similarities in the way the DAG is used in bith, I guess it would have perfect sense for that to be a specific tool, and not an evolution of Tailer or other

Re: [Monotone-devel] monomercurial sync

2007-04-17 Thread Patrick Georgi
Lapo Luchini schrieb: Or is anyone aware of an existing such project? I've been working on a c++ parser of hg's revlog format. I think I understand most of the format now, but some parts are missing: It needs an implementation of hg's delta algorithm and some more magic to link the

[Monotone-devel] Re: Mozilla goes mercurial

2007-04-17 Thread Bruce Stephens
Graydon Hoare [EMAIL PROTECTED] writes: [...] I can speak a bit about this; Paul's post oversimplifies for the sake of expedience (which is fine, he asked me what to say and I told him to oversimplify). I explicitly asked for monotone to be excluded part way through the process, and there

[Monotone-devel] Master Thesis

2007-04-17 Thread Ingo Maindorfer
Hello, some time ago I programmed with Thomas something for Guitone but my job didn't left time over for that coding. Now I'm studing Advanced Computer Science and looking for a topic for my master Thesis. I think there is something left over in context of monotone with scientific claim ;)

Re: [Monotone-devel] keyring integration from a user POV

2007-04-17 Thread Benoît Dejean
Le vendredi 13 avril 2007 à 19:37 -0700, Justin Patrin a écrit : On 4/13/07, Justin Patrin [EMAIL PROTECTED] wrote: On 4/13/07, Benoît Dejean [EMAIL PROTECTED] wrote: I am concerned about having to unlock all my keys on startup where is would prefer to unlock them on first use. Well,

[Monotone-devel] YANQ (yet another newbie question)

2007-04-17 Thread Ken MacDonald
Hi, Searched the archives and doc, and couldn't find an answer for this - or didn't recognize it as the answer if I did: I created a branch in a subdirectory, using what I found out later was the wrong name according to our naming conventions. In that subdirectory, I created a file and committed

Re: [Monotone-devel] YANQ (yet another newbie question)

2007-04-17 Thread Jack Lloyd
On Tue, Apr 17, 2007 at 05:25:02PM -0400, Ken MacDonald wrote: So, at this point I can't merge and would like to be able to get rid of the original version, but I can't 'drop' it because the path ../wrong_branch/file is gone, and I'm not sure what will make this happy again. Of course, I can

Re: [Monotone-devel] Master Thesis

2007-04-17 Thread William Uther
Heh, Off the top of my head: - An analysis of the relationship between different text merge algorithms: - Three way merge - Three way merge of annotated files (i.e. where the lines are identified) - Operational transformation theory / DARCS merge - Weave merge /

Re: [Monotone-devel] YANQ (yet another newbie question)

2007-04-17 Thread Markus Schiltknecht
Hi, Ken MacDonald wrote: I created a branch in a subdirectory, That very first line already makes me suspicious: why do you create the branch in a subdirectory? Maybe I'm misunderstanding, but: monotone is not like subversion, a branch is a branch - not internally the same as a