[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [RFC] Add Shelve and Checkpoint UI

From: Stefan Hett <stefan_at_egosoft.com>
Date: Fri, 1 Sep 2017 13:14:04 +0200

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.

Stefan Hett
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2017-09-02 02:13:50 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.