Ticket #1662 (closed enhancement: fixed)
Opened 7 years ago
Last modified 5 years ago
see/download a diff of individual files within a changeset
| Reported by: | xris | Owned by: | cboos |
|---|---|---|---|
| Priority: | normal | Milestone: | 0.10 |
| Component: | version control/changeset view | Version: | devel |
| Severity: | normal | Keywords: | tracdiff |
| Cc: | |||
| Release Notes: | |||
| API Changes: | |||
Description
Sometimes you just want to apply part of a changeset to your local branch (like if there's a conflict). It'd be really nice to be able to have that diff available in trac, rather than have to sort through the whole changeset.
Attachments
Change History
comment:1 Changed 7 years ago by cboos
- Owner changed from jonas to cboos
- Status changed from new to assigned
comment:2 Changed 7 years ago by xris
Well, it'd be nice to at least have a link next to each file in the list at the top of the page going to TracDiff that would show only those changes...
comment:3 Changed 7 years ago by anonymous
Another think that would be nice is to see a history of a single file, ie show incremental differences between successive revisions of a file.
It would look just like the current multi-file changeset diff, but instead of showing the differences in all files between changeset n and changeset n-1, it would diff a single file between muliple changesets.
I'll discuss this more on the mailing list and depending on the outcome of this may expand further.
comment:4 Changed 7 years ago by mgood
I believe that the previous comment is actually asking for blame support as in #629.
comment:5 Changed 6 years ago by cboos
- Keywords tracdiff added
comment:6 Changed 6 years ago by cboos
- Milestone set to 0.10
- Resolution set to fixed
- Status changed from assigned to closed
That's now possible using the
restricted changeset view:
from the TracBrowser, simply click on the Last Change navigation link,
and you go to a changeset page showing only the changes for the current path.
From there, the diff format link will produce the diff that you're looking for.



With the current status of TracDiff, it's already possible
to view a restricted changeset, i.e. a subset
of a changeset containing the changes below a given path.
Would that be enough?
OTOH, I had the idea of adding a possibility to filter out
changes from a given diff view (be it a changeset or a
more general diff), by the way of an Exclude checkbox
on each diff, but then I was not sure if it was really worth it...
Thoughts?