Mailing-List: contact dev-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Subject: Re: Checkpointing v1 design -- terminology
From: Julian Foad <julianfoad@apache.org>
To: dev@subversion.apache.org
References: <9a3d7e1b-0d10-b431-6d85-8056f108e5f2@apache.org>
 <92914552-01a9-2394-92b2-c76552ae2b79@apache.org>
 <a2e61333-690a-254e-b662-8e996cbfefae@apache.org>
 <5d51b1c1-8fd7-fd6b-6b9e-8eeb496734fc@apache.org>
 <1944507f-7ef2-44d6-ee6e-846e99325211@apache.org>
Message-ID: <d37561b0-e003-a872-f865-19a313810aa7@apache.org>
Date: Mon, 6 Nov 2017 16:30:33 +0000
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.4.0
MIME-Version: 1.0
In-Reply-To: <1944507f-7ef2-44d6-ee6e-846e99325211@apache.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-GB
Content-Transfer-Encoding: 8bit
archived-at: Mon, 06 Nov 2017 16:30:39 -0000

Julian Foad wrote:
> 'Roll back' means retrieving an old version of a shelved change and 
> could be named like one or a permutation of these:
> 
>    svn unshelve --checkpoint=3 foo
>    svn shelf restore foo@3
>    svn revert --savepoint=3 --cl=foo
>    svn changelist restore -v3 foo
> 
> (I am deliberately bringing 'changelist' into the mix, as I believe 
> integration with 'changelist' is where we need to take this.)

The integration with changelists that I am thinking of is basically that 
changelist FOO corresponds to the working (unshelved) version of a 
shelved change named FOO. Unshelving or restoring FOO will apply the 
saved change FOO and assign the affected files to changelist FOO; and 
saving or shelving FOO will use the changelist FOO as the set of files 
to save or shelve.

With this changelist integration we could have... (I know we can't 
compatibly have exactly this syntax; see below for alternatives)...

Shelve = save and revert:
   svn cl shelve FOO

Checkpoint = save and don't revert:
   svn cl save FOO

Unshelve / restore / roll back (all possible names for same thing):
   svn cl unshelve [-v VERSION_NUM] FOO
   svn cl restore [-v VERSION_NUM] FOO
   (etc.)

Revert files in (active) changelist FOO:
   svn revert --cl=FOO  # existing syntax
   svn cl revert FOO

Commit the (possibly shelved) changelist FOO:
   svn commit --cl=FOO  # existing syntax
   svn cl commit FOO


Possible different ways to write the topic noun and the verb:

   svn clsave          FOO [PATH...]
   svn cl save         FOO [PATH...]
   svn cl --save       FOO [PATH...]
   svn changelist save FOO [PATH...]
   svn changelist-save FOO [PATH...]

   svn save       --cl=FOO [PATH...]


The key point I am making here is the "topic" we're talking about in 
these commands is the "changelist" rather than the "savepoint" which is 
merely a stored version of a changelist.

- Julian