Re: Shelving / Checkpointing thoughts

2017-08-25 Thread Julian Foad
Forgot the conclusion... Julian Foad wrote: > Johan Corveleyn wrote: >> Still only one shelf per WC (*the* shelf)? Grouping them through >> naming ("savepoint-1", "savepoint-2" are two shelved patches belonging >> to the same series, but "featureA" (which was reverted) is separate >> because it do

Re: Shelving / Checkpointing thoughts

2017-08-25 Thread Julian Foad
Johan Corveleyn wrote: >> * "Shelving" or "to shelve" means putting something on a shelf. There >> is one "shelf" per WC. >> >> * The thing we put on the shelf is called a "patch" or a "shelved >> change", and is analogous to a book or a paper placed on the shelf. A >> numbered version of a pat

Re: Shelving / Checkpointing thoughts

2017-08-25 Thread Johan Corveleyn
On Fri, Aug 25, 2017 at 4:59 PM, Julian Foad wrote: > Johan Corveleyn wrote: >> On Fri, Aug 25, 2017 at 3:33 PM, Julian Foad wrote: > [...]>> The Checkpoint feature could add the copy-and-modify facility > for the >>> log message. >> >> Yes, maybe we'll need to have some grouping structure / name

Re: Tip of the day: Cheatsheet for common cmdline client operations

2017-08-25 Thread C. Michael Pilato
I like either idea, though of course I lean towards not duplicating information that's already maintained elsewhere unless, of course, there's reason to believe that it *won't* be maintained elsewhere. Just for kicks, I did some Googling around: - "Subversion cheat sheet": returns a number o

Towards a Shelving MVP

2017-08-25 Thread Julian Foad
It seems Shelving in the current form is working out quite nicely. I'm thinking about what more we need so that any of us or our friends would be comfortable testing it on non-trivial data and calling the feature set a "minimum viable product". I thought of: Hardening before being safe to use:

RE: svn commit: r1806017 - /subversion/trunk/subversion/libsvn_ra_serf/merge.c

2017-08-25 Thread Bert Huijben
> -Original Message- > From: kot...@apache.org [mailto:kot...@apache.org] > Sent: donderdag 24 augustus 2017 11:43 > To: comm...@subversion.apache.org > Subject: svn commit: r1806017 - > /subversion/trunk/subversion/libsvn_ra_serf/merge.c > > Author: kotkov > Date: Thu Aug 24 09:43:28 20

Re: Problem with non-conflicting merges of moves

2017-08-25 Thread Daniel Shahaf
Stefan Sperling wrote on Thu, 24 Aug 2017 13:44 +0200: > 5) Make the server send copyfrom args again (as it did in 1.5 times for > files during 'svn update'), but only during merges/(diffs?) and for > files and directories, with a heuristic that sends the correct copyfrom > source to t

Re: Shelving / Checkpointing thoughts

2017-08-25 Thread Julian Foad
Johan Corveleyn wrote: > On Fri, Aug 25, 2017 at 3:33 PM, Julian Foad wrote: [...]>> The Checkpoint feature could add the copy-and-modify facility for the >> log message. > > Yes, maybe we'll need to have some grouping structure / namespacing in > the shelves for this. A "rack" or something :-).

Re: Shelving / Checkpointing thoughts

2017-08-25 Thread Johan Corveleyn
On Fri, Aug 25, 2017 at 3:33 PM, Julian Foad wrote: ... >> == Shelving == >> >> Looks great so far. Of course a lot of challenges remain for all the >> cases which are not yet (correctly) covered by 'svn diff' and 'svn >> patch' (property changes, tree operations, binary files, unresolved >> confl

Re: Shelving / Checkpointing thoughts

2017-08-25 Thread Julian Foad
Johan, thank you very much for these considered thoughts! Johan Corveleyn wrote: > First of all: thanks for working on shelving and checkpointing, > Julian. These could become very important and big features. Daunting > to take them on, but it's good to see someone having a go at it. > > I've tri

How should shelving interact with checkpoints?

2017-08-25 Thread Julian Foad
I have been thinking about, and written [1], the following: How should shelving interact with checkpoints? In other words, what do we expect to happen if we start working, make some checkpoints, and then shelve "the work" to work on something else? Do we usually want to shelve the whole series o

Shelving / Checkpointing thoughts

2017-08-25 Thread Johan Corveleyn
First of all: thanks for working on shelving and checkpointing, Julian. These could become very important and big features. Daunting to take them on, but it's good to see someone having a go at it. I've tried to read through all the docs and recent mail threads. Below are a couple of thoughts. TL

Re: 'svn list --search' feature complete?

2017-08-25 Thread Julian Foad
Johan Corveleyn wrote: > On Mon, Aug 21, 2017 at 8:14 PM, Daniel Shahaf > wrote: >> Julian Foad wrote on Mon, 21 Aug 2017 14:09 +0100: >>> Also the search term seems to be required to match the entire path, so I >>> need to write "co*" rather than just "co" to match "configure.ac". That >>> is in

Re: Tip of the day: Cheatsheet for common cmdline client operations

2017-08-25 Thread Johan Corveleyn
[ cc -= svnbook-dev, as I guess this will not become book-material. More below ... ] On Thu, Jul 13, 2017 at 6:34 PM, C. Michael Pilato wrote: > On Thu, Jul 13, 2017 at 11:21 AM, Daniel Shahaf > wrote: >> >> [moving from users@ ] >> >> Daniel Shahaf wrote on Fri, 30 Jun 2017 09:15 +: >> > I

Re: Shelving and Checkpointing support log messages

2017-08-25 Thread Stefan Sperling
On Fri, Aug 25, 2017 at 10:08:04AM +0100, Julian Foad wrote: > Example workflow: > > 1. There exists a shelved patch 'foo' with a verbose log message > 2. 'svn unshelve foo' There can only be one changelist per file. What if at this point there is another changelist 'bar' which includes a file mo

Re: Shelving and Checkpointing support log messages

2017-08-25 Thread Johan Corveleyn
On Fri, Aug 25, 2017 at 11:08 AM, Julian Foad wrote: > Daniel Shahaf wrote: >> Julian Foad wrote on Thu, 24 Aug 2017 19:46 +0100: >>> One rough edge is that "unshelving" a patch or finishing/squashing a >>> checkpoint series simply discards the log message(s). [...] >> >> [...] to enable the "long

Re: Shelving and Checkpointing support log messages

2017-08-25 Thread Julian Foad
Daniel Shahaf wrote: > Julian Foad wrote on Thu, 24 Aug 2017 19:46 +0100: >> One rough edge is that "unshelving" a patch or finishing/squashing a >> checkpoint series simply discards the log message(s). [...] > > [...] to enable the "long log message" use-case, there should be an easy > "upgrade p