On 05.04.2016 20:42, Stefan Küng wrote:
> On 05.04.2016 13:55, fonitzu wrote:
>> Hi,
>>
>> After digging for a while, I have found in tsvn's help at 4.4.3 that
>> using TortoiseMerge it is possible to "cherry picking" changes to be
>> included in a commit (in context of "Restore after commit").
>>
>> How about other differs?
>> I regularly use ExamDiff and I miss this feature, I always need to undo
>> all other unrelated changes in a file before committing.
>
> It doesn't matter which diff tool you use. If you activate "restore
> after commit", then you can edit the file with whatever tool you like
> and then commit. After the commit, the file is restored to what it was
> before, i.e. a new diff will show only those changes that were not
> committed before.
>
I know about that.
What I would like to have is a process like this:
- make a backup of the actual file (what actually "Restore after commit"
do),
- revert the file,
- diff the (reverted) file against the backup (and save the changes
using the diff tool),
- commit the file,
- restore the backup.
This will easily allow "cherry picking" working copy changes into the
commit, I don't have to revert (a lot of) changes using the diff tool
when I use "Restore after commit" to be able to keep only one change.
Of course I can do all this stuff manually, but it is not convenient to
me because usually I open the commit dialog to figure out which file(s)
are changed and need to be part of the commit and mostly have to commit
file(s) in more than one step.
foni
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3168371
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2016-04-06 08:34:52 CEST