Login | Register
My pages Projects Community openCollabNet

Discussions > dev > Re: [RFC] Add Shelve and Checkpoint UI

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: [RFC] Add Shelve and Checkpoint UI

Author stefanego
Full name Stefan Hett
Date 2017-09-01 17:12:11 PDT
Message On 8/25/2017 9:20 PM, Stefan Küng wrote:
>> UI for Unshelving involves:
>>   * TSVN shows the list of shelved patches and user chooses one;
>>   * TSVN tells Subversion to 'unshelve': SVN applies the patch to the
>> WC and deletes the patch (if no conflicts);
>>   * TSVN presents any resulting patch conflicts as for 'svn patch'.
> If possible, the 'svn patch' should (automatically or via interaction)
> fetch the conflicted file from the base revision (base of the patch) and
> then try a three-way-merge with that before producing a reject.
> Because as I mentioned above, applying a patch is not very good.

On a side note: SVN 1.10 will contain several fixes/improvements to the
patch handling. So while it certainly won't solve all the issues on this
side, I expect TSVN 1.10 to handle patches better than TSVN 1.9.

--
Regards,
Stefan Hett
Attachments

« Previous message in topic | 3 of 4 | Next message in topic »

Messages

Show all messages in topic

[RFC] Add Shelve and Checkpoint UI julianfoad Julian Foad 2017-08-24 07:10:03 PDT
     Re: [RFC] Add Shelve and Checkpoint UI steveking Stefan Küng 2017-08-25 12:19:05 PDT
         Re: [RFC] Add Shelve and Checkpoint UI stefanego Stefan Hett 2017-09-01 17:12:11 PDT
     Re: [RFC] Add Shelve and Checkpoint UI julianfoad Julian Foad 2017-08-28 14:21:13 PDT
Messages per page: