Re: [RFC] Add Shelve and Checkpoint UI
Stefan Hett <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.tortoisesvn.devel |
|---|---|
| Message-ID | <[email protected]> |
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 ------------------------------------------------------ http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3296245 To unsubscribe from this discussion, e-mail: [[email protected]].