Re: [Monotone-devel] Re: How will policy branches work?

2008-02-12 Thread Markus Schiltknecht
Hello Nuno, Nuno Lucas wrote: The ideal (in an academic view) source code has the maximum independence possible between source files, so one can achieve maximum re-usability. So every source file can be thought as an internal library (a black box) for the rest of the program. It's when you grou

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-11 Thread Nuno Lucas
On Feb 10, 2008 10:57 PM, Markus Schiltknecht <[EMAIL PROTECTED]> wrote: > Nuno Lucas wrote: > > In this case you could say they are modules, but it could be a single > > file on the source tree, with no clear separation between it and other > > source files. You can't have a branch per source file

Re: Re: [Monotone-devel] Re: How will policy branches work?

2008-02-11 Thread Nuno Lucas
On Feb 11, 2008 9:09 AM, Daniel THOMPSON <[EMAIL PROTECTED]> wrote: > Nuno Lucas wrote: > >>> Probably this will be solved when monotone gets a proper "cherry pick" > >>> system. It would then be possible to "pluck" some group of revisions > >>> (that could be restricted by path) and retain history

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-11 Thread Nuno Lucas
On Feb 9, 2008 11:47 AM, Bruce Stephens <[EMAIL PROTECTED]> wrote: > "Nuno Lucas" <[EMAIL PROTECTED]> writes: > > [...] > > > An extreme example of "cherry picking" is git bissect command. You > > could have the some functionality on monotone if people could also > > "unpluck" a changeset. > > git

Re: Re: [Monotone-devel] Re: How will policy branches work?

2008-02-11 Thread Daniel THOMPSON
Nuno Lucas wrote: >>> Probably this will be solved when monotone gets a proper "cherry pick" >>> system. It would then be possible to "pluck" some group of revisions >>> (that could be restricted by path) and retain history. >> I'm not exactly sure what you have in mind for being a "proper cherry >

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-10 Thread Markus Schiltknecht
Hello Nuno, Nuno Lucas wrote: In this case you could say they are modules, but it could be a single file on the source tree, with no clear separation between it and other source files. You can't have a branch per source file (you could but makes no sense). You can commit different changes to a

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-08 Thread Nuno Lucas
On Feb 8, 2008 12:22 PM, Markus Schiltknecht <[EMAIL PROTECTED]> wrote: > Nuno Lucas wrote: > Well, as long as no single commit spans several modules, you should > probably use separate branches per module anyway. In this case you could say they are modules, but it could be a single file on the so

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-08 Thread Markus Schiltknecht
Hi, Nuno Lucas wrote: I see the problem now. Seems like the simple way of solving it may be by introducing helper revisions. But that could clutter the repository with no apparent gain, aside more history. OTOH, I somehow missed the path restriction option on "mtn pluck". Maybe it wasn't there

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-08 Thread Nuno Lucas
On Feb 7, 2008 7:16 AM, Markus Schiltknecht <[EMAIL PROTECTED]> wrote: > > By the way, I don't see as this is any different than what is already > > done by a 3-way merge with user editings. It's not the original > > revision either. > > Well, the difference is, with a 3-way merge, you are saying:

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-06 Thread Markus Schiltknecht
Hi, Nuno Lucas wrote: What's the problem with that? It is an independent library so any other changes in other files have no relation with the changes we made in that directory (or other restricted path). No problem with that. I just don't agree that partly unmerged revisions are a good thing

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-06 Thread Timothy Brownawell
On Wed, 2008-02-06 at 19:46 +0100, Markus Schiltknecht wrote: > Hi, > > Nuno Lucas wrote: > > "Policy branches" aside, this is a feature it would be nice to have: > > merge/propagate with path restrictions. > > > > A simple (and common) use-case is propagating/merging changes made in > > a sub-d

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-06 Thread Nuno Lucas
On Feb 6, 2008 6:46 PM, Markus Schiltknecht <[EMAIL PROTECTED]> wrote: > Nuno Lucas wrote: > > "Policy branches" aside, this is a feature it would be nice to have: > > merge/propagate with path restrictions. > > > > A simple (and common) use-case is propagating/merging changes made in > > a sub-dir

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-06 Thread Markus Schiltknecht
Hi, Bruce Stephens wrote: I doubt that would be workable. Yeah, that was where I'm in agreement with you. I was suggesting deliberately keeping the hash the same, but allowing the thing refered to by it to be something other than the contents. (It would need to be something special, otherwis

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-06 Thread Markus Schiltknecht
Hi, Bruce Stephens wrote: Uh.. the manifest has never included the text itself, AFAIR. And still today, the revision data references the file's contents by hash exclusively. So do the rosters. I know, I meant that the thing referenced by the hash would not be the real contents (it would be som

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-06 Thread Markus Schiltknecht
Hi, Bruce Stephens wrote: Hmm. So the manifest has a hash that points to something that says I don't have permission to it (rather than to the text itself). I guess I can imagine that working. Uh.. the manifest has never included the text itself, AFAIR. And still today, the revision data re

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-06 Thread Markus Schiltknecht
Hi, Nuno Lucas wrote: "Policy branches" aside, this is a feature it would be nice to have: merge/propagate with path restrictions. A simple (and common) use-case is propagating/merging changes made in a sub-directory (possibly a library, like sqlite in monotone repo) to another branch. This w

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-06 Thread Nuno Lucas
On Feb 6, 2008 5:32 PM, Bruce Stephens <[EMAIL PROTECTED]> wrote: > Markus Schiltknecht <[EMAIL PROTECTED]> writes: > > [...] > > > I'd generally vote for files, even if that's still a long way to go. > > That strikes me as impractical. How can I merge two revisions if I > can't see some of the ch

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-06 Thread Markus Schiltknecht
Hi, Bruce Stephens wrote: That strikes me as impractical. How can I merge two revisions if I can't see some of the changed files? You should be able to merge, as long as the revisions you are trying to merge both point to the same revid for all invisible or disallowed files. Otherwise, you

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-06 Thread Markus Schiltknecht
Hi, Brian May wrote: I don't think it is possible to restrict the branches somebody can push; either they have full write access or no write access. Uh.. right, of course. Sorry for the noise. And netsync even propagates revisions around, it doesn't trust itself. Big time for nuskool, IMO.

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-05 Thread Brian May
> "Markus" == Markus Schiltknecht <[EMAIL PROTECTED]> writes: Markus> With read-permissions and write-permissions, you can already implement Markus> some sort of a person <-> branches thing. Please check the manual for Markus> these things. Considering that most commercial projec

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-05 Thread Markus Schiltknecht
Hello Boris, Boris wrote: You are right. I need to clarify my requirements: I need to define projects and assign people to them. People can do whatever they want in their projects. However they must not get the files in the other projects (which means they either aren't transferred or they are

Re: [Monotone-devel] Re: How will policy branches work?

2008-02-05 Thread Zack Weinberg
Before I get into specific concerns of yours, I want to say up front that this list talks about "policy branches" as if it were one thing, but it's not; it's a whole cluster of features. We ultimately want to support all of them, but we're not going to do all of them at once. If I understand your