Re: Commit only parts of files

On Wed, Apr 6, 2016 at 8:34 AM, fonitzu <no_spam_at_fonitzu.com> wrote:

> 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,
>

No, don't revert, but just...

> - diff the (reverted) file against the backup (and save the changes
> using the diff tool),
>

... diff the changes. then in the diff tool, *undo* the changes you don't
want to commit and then save.

> - commit the file,
> - restore the backup.
>
>
the rest stays the same.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3168401
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].