Re: Shelving / Checkpointing thoughts

2017-08-28 Thread Daniel Shahaf
Paul Hammant wrote on Sun, Aug 27, 2017 at 07:04:03 -0400: > Delegating to libgit2 to invisibly handle: shelves, local-branches and > pull-requests could yield a workable and flexible implementation. Apache products aren't allowed to depend on GPL'd code for mandatory / core features. What is the

Re: Towards a Shelving MVP

2017-08-28 Thread Daniel Shahaf
Julian, regarding your latest mail in this thread: Daniel Shahaf wrote on Mon, Aug 28, 2017 at 23:27:00 +: > We all seem to be in agreement that we need to store the file contents > on the shelf's base and the file contents as modified in the shelved > patch. There are many possible ways to d

Re: Towards a Shelving MVP

2017-08-28 Thread Daniel Shahaf
Could we divorce the questions of storage and algorithms, please? We all seem to be in agreement that we need to store the file contents on the shelf's base and the file contents as modified in the shelved patch. There are many possible ways to do so: as two full files, or as unidiffs, or even as

Re: Shelving / Checkpointing thoughts

2017-08-28 Thread Paul Hammant
Here's a prototype in Python2 that makes a git repo in a 'shelve' folder. Two commits - one with the starting position, and one with the ending position. The 'svn info' for the resource is copied in too (same file name with a '.info' suffix). import sh import os from stat import S_IWUSR, S_IREAD

Re: Towards a Shelving MVP

2017-08-28 Thread Johan Corveleyn
On Mon, Aug 28, 2017 at 9:05 PM, Julian Foad wrote: > Branko Čibej wrote: >> On the topic of storing patches, I'd like to propose an alternative >> implementation. >> >> Instead of saving a set of patches, save two sets of (untranslated >> pristine) files: >> >> * All currently modified files >>

Re: Shelving / Checkpointing thoughts

2017-08-28 Thread Paul Hammant
Perhaps easy to prototype in Python, too.

Re: Shelving / Checkpointing thoughts

2017-08-28 Thread Julian Foad
Paul Hammant wrote: > Delegating to libgit2 to invisibly handle: shelves, local-branches and > pull-requests could yield a workable and flexible implementation. > [...] It will definitely be worth me looking into the possibilities. Thanks for the suggestion. - Julian

Re: Towards a Shelving MVP

2017-08-28 Thread Julian Foad
Branko Čibej wrote: > On the topic of storing patches, I'd like to propose an alternative > implementation. > > Instead of saving a set of patches, save two sets of (untranslated > pristine) files: > > * All currently modified files > * Their pristine, unmodified versions (these are of course

[PATCH] Add XFail test for relocating working copy with removed externals

2017-08-28 Thread Ivan Zhakov
Log message: [[[ Add XFail test for relocating working copy with removed externals. Found by: TortoiseSVN dump Patch by: Ivan Zhakov {ivan {at} visualsvn.com} * subversion/tests/cmdline/relocate_tests.py (relocate_with_removed_externals): New test. (test_list): Add new test to the test list.