Re: [RFC] Shelving and Checkpointing

2017-07-24 Thread Julian Foad
Hi Nathan. Thanks for your thoughts. Nathan Hartman wrote: > Julian Foad wrote: > Diffing checkpoints is quite hard (well, needs a patch-arithmetic > library) in this design. Even just determining whether two patches > are "identical". That might be a good reason for me to try the >

Re: [RFC] Shelving and Checkpointing

2017-07-24 Thread Nathan Hartman
On Fri, Jul 14, 2017 at 7:56 AM, Julian Foad wrote: > Diffing checkpoints is quite hard (well, needs a patch-arithmetic library) in > this design. Even just determining whether two patches are "identical". That > might be a good reason for me to try the alternative design "store > checkpoints i

Re: [RFC] Shelving and Checkpointing

2017-07-14 Thread Julian Foad
I committed an initial prototype for checkpointing on the "shelve-checkpoint" branch. http://svn.apache.org/r1801942 This prototype is of the "store snapshot patches" ("option 1") design. Here is the help output: [[[ $ svn checkpoint --help checkpoint: Checkpoint the local changes. usage: 1. c

Re: [RFC] Shelving and Checkpointing

2017-07-12 Thread Julian Foad
Bert Huijben wrote: Julian Foad wrote: Mark Phippard wrote: [...] does patch just create conflicts that you resolve like anything else? It is 'svn patch' -- so it raises conflicts. Svn patch creates reject files. It doesn't create conflicts (yet). Gosh, so it does! How primitive! :-) I

RE: [RFC] Shelving and Checkpointing

2017-07-12 Thread Bert Huijben
> -Original Message- > From: Julian Foad [mailto:julianf...@apache.org] > Sent: woensdag 12 juli 2017 16:38 > To: Mark Phippard > Cc: Subversion Developers > Subject: Re: [RFC] Shelving and Checkpointing > > Mark Phippard wrote: > > Nice to see you have

Re: [RFC] Shelving and Checkpointing

2017-07-12 Thread Julian Foad
Mark Phippard wrote: Nice to see you have gotten this far. I am not even sure how this behaves with git stash but what happens if the patch cannot be applied cleanly? Is the path to "fixing things" relatively clear? Like does patch just create conflicts that you resolve like anything else?

Re: [RFC] Shelving and Checkpointing

2017-07-12 Thread Julian Foad
Johan Corveleyn wrote: I've quickly scanned your google docs, but have to go through them in some more detail. I'll try to dig into them and give some feedback if I can. Thanks you Johan! I look forward to hearing your comments when you have a chance. One thing that crossed my mind: a nice

Re: [RFC] Shelving and Checkpointing

2017-07-12 Thread Mark Phippard
On Wed, Jul 12, 2017 at 4:18 AM, Julian Foad wrote: > I committed an initial prototype for shelving on the "shelve-checkpoint" > branch. > > Here is the help output: > [[[ > $ svn shelve --help > shelve: Shelve changes. > usage: 1. shelve NAME PATH... >2. shelve --delete NAME >3.

Re: [RFC] Shelving and Checkpointing

2017-07-12 Thread Johan Corveleyn
On Mon, Jul 10, 2017 at 2:59 PM, Julian Foad wrote: > Dear Subversion Developers, > > I am delighted to announce that I am working with Assembla to develop > shelving and checkpointing functionality in Subversion. These have > been on the wish list for many years, and are becoming ever more in > d

Re: [RFC] Shelving and Checkpointing

2017-07-12 Thread Julian Foad
I committed an initial prototype for shelving on the "shelve-checkpoint" branch. Here is the help output: [[[ $ svn shelve --help shelve: Shelve changes. usage: 1. shelve NAME PATH... 2. shelve --delete NAME 3. shelve --list 1. Shelve as NAME the local changes in the given PATHs

Re: [RFC] Shelving and Checkpointing

2017-07-12 Thread Julian Foad
Daniel Shahaf wrote: Julian Foad wrote on Tue, 11 Jul 2017 21:53 +0100: 2. What I was thinking there is to rewrite as much of our libs as needed to implement deeply integrated local branching in Svn client. The full extent of what that might entail or look like is unknown. I don't understand t

Re: [RFC] Shelving and Checkpointing

2017-07-11 Thread Branko Čibej
On 11.07.2017 10:53, Julian Foad wrote: > Thanks for your suggestion, Nathan. > > Nathan Hartman wrote: >> [...] What if, instead of just a pristine copy, it actually created a >> private local repository. Revision 1 of this repository would be the >> pristine copy. [...] if you type some other com

Re: [RFC] Shelving and Checkpointing

2017-07-11 Thread Daniel Shahaf
Sorry, pressed [Send] too early. Thanks for the explanations. More below. Daniel Shahaf wrote on Tue, 11 Jul 2017 22:02 +: > Julian Foad wrote on Tue, 11 Jul 2017 21:53 +0100: > > Daniel Shahaf wrote: > > > Julian Foad wrote: > > >> Checkpointing > > >> > > >> Options: > > >> > > >> 1. f

Re: [RFC] Shelving and Checkpointing

2017-07-11 Thread Nathan Hartman
On Tue, Jul 11, 2017 at 4:53 AM, Julian Foad wrote: > Nathan Hartman wrote: > >> [...] What if, instead of just a pristine copy, it actually created a >> private local repository. Revision 1 of this repository would be the >> pristine copy. [...] >> > > That is exactly what I was thinking about w

Re: [RFC] Shelving and Checkpointing

2017-07-11 Thread Daniel Shahaf
Julian Foad wrote on Tue, 11 Jul 2017 21:53 +0100: > Daniel Shahaf wrote: > > Julian Foad wrote: > >> Checkpointing > >> > >> Options: > >> > >> 1. further patch management built on a series of shelved changes > >> 2. local commits tightly integrated > >> 3. checkpoints are commits in a

Re: [RFC] Shelving and Checkpointing

2017-07-11 Thread Julian Foad
Daniel Shahaf wrote: Julian Foad wrote: Checkpointing Options: 1. further patch management built on a series of shelved changes 2. local commits tightly integrated 3. checkpoints are commits in a local repository Can you explain these three options in more words? AIUI #1 is "syn

Re: [RFC] Shelving and Checkpointing

2017-07-11 Thread Daniel Shahaf
On Mon, Jul 10, 2017 at 02:03:41PM +0100, Julian Foad wrote: > Checkpointing > > Options: > > >1. > >further patch management built on a series of shelved changes >2. > >local commits tightly integrated >3. > >checkpoints are commits in a local repository Can you expl

Re: [RFC] Shelving and Checkpointing

2017-07-11 Thread Julian Foad
Thanks for your suggestion, Nathan. Nathan Hartman wrote: [...] What if, instead of just a pristine copy, it actually created a private local repository. Revision 1 of this repository would be the pristine copy. [...] if you type some other command instead of commit, or maybe prepend the word

Re: [RFC] Shelving and Checkpointing

2017-07-10 Thread Nathan Hartman
On Jul 10, 2017, at 8:59 AM, Julian Foad wrote: > > Dear Subversion Developers, > > I am delighted to announce that I am working with Assembla to develop > shelving and checkpointing functionality in Subversion. These have > been on the wish list for many years, and are becoming ever more in > d

[RFC] Shelving and Checkpointing

2017-07-10 Thread Julian Foad
Dear Subversion Developers, I am delighted to announce that I am working with Assembla to develop shelving and checkpointing functionality in Subversion. These have been on the wish list for many years, and are becoming ever more in demand since the popularity of git is making more users appreciat