Re: [fossil-users] 'finfo' or '/finfo' to display all diffs in sequence?
On 23 July 2014 13:10, Richard Hipp d...@sqlite.org wrote: On Wed, Jul 23, 2014 at 6:45 AM, Michai Ramakers m.ramak...@gmail.com is it somehow possible to persuade 'finfo' or webpage '/finfo' to display the actual diffs (not aggregate diff) between each revisions of the artifact? Or: is there anoter page / CLI-command that does this? What do you mean by actual diff and aggregate diff? - 'actual diffs' (plural): the individual diffs of each change to the artifact (3 diffs, in case there were 3 changes) - aggregate diff: diff between start- and end-point in history (1 diff, even if there were 3 changes). This is what 'vdiff' would display. (btw, this mail is not effectively a duplicate of an earlier one, where I asked about displaying individual diffs instead of aggregate diff in the 'vdiff' page...) Michai ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] 'finfo' or '/finfo' to display all diffs in sequence?
On Wed, Jul 23, 2014 at 7:23 AM, Michai Ramakers m.ramak...@gmail.com wrote: On 23 July 2014 13:10, Richard Hipp d...@sqlite.org wrote: On Wed, Jul 23, 2014 at 6:45 AM, Michai Ramakers m.ramak...@gmail.com is it somehow possible to persuade 'finfo' or webpage '/finfo' to display the actual diffs (not aggregate diff) between each revisions of the artifact? Or: is there anoter page / CLI-command that does this? What do you mean by actual diff and aggregate diff? - 'actual diffs' (plural): the individual diffs of each change to the artifact (3 diffs, in case there were 3 changes) - aggregate diff: diff between start- and end-point in history (1 diff, even if there were 3 changes). This is what 'vdiff' would display. I find these definitions odd. I think sequence of edits would be a better way of expressing the concept you are calling actual diff. To my mind, a diff is a comparison between two artifacts. The provenance of those artifacts is irrelevant from the point of view of the diff. So you question translates to: Is there a way to show the sequence of edits the transformed one version of a file into another, rather than just the diff between the two files? The answer is no, I think. For multiple reasons: (1) I know how to display a diff, but I don't know what the display of a sequence of edits might look like. (2) Due to merging, there might be multiple paths from one file to the other in the DAG. Which path should be shown? -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] 'finfo' or '/finfo' to display all diffs in sequence?
On 23 July 2014 13:53, Richard Hipp d...@sqlite.org wrote: On Wed, Jul 23, 2014 at 7:23 AM, Michai Ramakers m.ramak...@gmail.com wrote: On 23 July 2014 13:10, Richard Hipp d...@sqlite.org wrote: On Wed, Jul 23, 2014 at 6:45 AM, Michai Ramakers m.ramak...@gmail.com is it somehow possible to persuade 'finfo' or webpage '/finfo' to display the actual diffs (not aggregate diff) between each revisions of the artifact? Or: is there anoter page / CLI-command that does this? What do you mean by actual diff and aggregate diff? - 'actual diffs' (plural): the individual diffs of each change to the artifact (3 diffs, in case there were 3 changes) - aggregate diff: diff between start- and end-point in history (1 diff, even if there were 3 changes). This is what 'vdiff' would display. I find these definitions odd. I think sequence of edits would be a better way of expressing the concept you are calling actual diff. To my mind, a diff is a comparison between two artifacts. The provenance of those artifacts is irrelevant from the point of view of the diff. So you question translates to: Is there a way to show the sequence of edits the transformed one version of a file into another, rather than just the diff between the two files? sequence of edits, exactly. The answer is no, I think. For multiple reasons: (1) I know how to display a diff, but I don't know what the display of a sequence of edits might look like. (2) Due to merging, there might be multiple paths from one file to the other in the DAG. Which path should be shown? I see. I generally don't use branches except for trials, but this situation is a bit too simplistic. Rephrase: in a situation where artifact A is an ancestor of B on a single branch, and no merges occur in the corresponding (partial) timeline, I'd be happy with a way to view the sequence of edits between those 2 artifacts. Is there such a way? What I do now is manually click the diffs, one by one. (A recent situation where an aggregate diff is not useful: I keep a 'todo'-list kind of textfile, where new items are added to the top, and old items are removed from the bottom. An aggregate diff over a longer time-period would omit all but the oldest and newest lines ever added to the file.) Michai ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] 'finfo' or '/finfo' to display all diffs in sequence?
Richard Hipp d...@sqlite.org writes: So you question translates to: Is there a way to show the sequence of edits the transformed one version of a file into another, rather than just the diff between the two files? Maybe he is thinking about something like this: http://emacsredux.com/blog/2014/07/22/travel-back-and-forward-in-git-history/ Sincerely, Gour -- It is far better to discharge one's prescribed duties, even though faultily, than another's duties perfectly. Destruction in the course of performing one's own duty is better than engaging in another's duties, for to follow another's path is dangerous. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] 'finfo' or '/finfo' to display all diffs in sequence?
On 23 July 2014 14:36, Gour g...@atmarama.net wrote: Richard Hipp d...@sqlite.org writes: So you question translates to: Is there a way to show the sequence of edits the transformed one version of a file into another, rather than just the diff between the two files? Maybe he is thinking about something like this: http://emacsredux.com/blog/2014/07/22/travel-back-and-forward-in-git-history/ actually, yes. (Minus the emacs and visualness and interactiveness ;) I realise that what I really meant has not much to do with 2 artifacts, but with one - traverse the history of that single artifact (let's say until it hits a merge) in terms of edits. Michai ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] 'finfo' or '/finfo' to display all diffs in sequence?
Michai Ramakers m.ramak...@gmail.com writes: actually, yes. (Minus the emacs and visualness and interactiveness ;) Np. Those are just add-ons. ;) I realise that what I really meant has not much to do with 2 artifacts, but with one - traverse the history of that single artifact (let's say until it hits a merge) in terms of edits. I'm leaving this part to Fossil experts. :-) Sincerely, Gour -- The senses are so strong and impetuous, O Arjuna, that they forcibly carry away the mind even of a man of discrimination who is endeavoring to control them. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
