#1662 closed enhancement (fixed)
see/download a diff of individual files within a changeset
Reported by: | xris | Owned by: | Christian Boos |
---|---|---|---|
Priority: | normal | Milestone: | 0.10 |
Component: | version control/changeset view | Version: | devel |
Severity: | normal | Keywords: | tracdiff |
Cc: | Branch: | ||
Release Notes: | |||
API Changes: | |||
Internal 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 (0)
Change History (6)
comment:1 by , 19 years ago
Owner: | changed from | to
---|---|
Status: | new → assigned |
comment:2 by , 19 years ago
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 by , 19 years ago
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 by , 19 years ago
I believe that the previous comment is actually asking for blame support as in #629.
comment:5 by , 19 years ago
Keywords: | tracdiff added |
---|
comment:6 by , 19 years ago
Milestone: | → 0.10 |
---|---|
Resolution: | → fixed |
Status: | assigned → 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?