On Sat, Sep 12, 2015 at 01:10:28PM +0200, j. van den hoff wrote:
> On Sat, 12 Sep 2015 01:45:28 +0200, Johan Kuuse <jo...@kuu.se> wrote:
>
> >fossil diff -before
> >
> >or
> >
> >fossil diff -before-commit
>
> typo... I just wanted to propose another name for the requested
> option, and actually I meant "call it `diff --before' or `diff
> --before-update' which I for one would be able to memorize as
> "compute diff of current state vs. state before the preceding
> update". actually, considering the original posters `subject' line,
> one might also look at it the other way round and call it `diff
> --after-update' ;-)
>
> personally, I find reference to the undo buffer a long way from
> being obvious to someone just using fossil as DVCS (rather than
> someone interested in in the details/internals of `fossil').
It depend what the feature really do. As it is implemented now (if I
understand it well) it make a diff against the undo buffer, doesn't
matter what was the previous command.
So in that case, I think it should refer to the undo buffer somehow.
What if someone does :
----------------------
$ fossil update
...
$ fossil stash
# some hacking...
$ fossil shash pop
$ fossil diff --before-update (or fossil diff --undo)
----------------------
In this case, it would be confusing if it doesn't really do the
diff with what was on disk before the update. Right now with the
" fossil diff --undo" , it would make the diff from current file on disk with
what it
was before the "fossil stash pop" command.
>
> >
> >?
> >El 12/9/2015 1:14, "Andy Bradford" <amb-fos...@bradfords.org> escribió:
> >
> >>Thus said Richard Hipp on Fri, 11 Sep 2015 10:11:30 -0400:
> >>
> >>> "fossil diff --versus-undo" maybe???
> >>
> >>What if instead of making this a feature of ``fossil diff'' it became a
> >>feature of ``fossil undo?''
> >>
> >>fossil undo --diff
I think that "fossil diff --from undo" have the advantage to be clear
and represent what the command really does compare to let say:
fossil undo --diff : might be interpret as it undo something
fossil diff --undo : is less explicit than --from undo
--
Martin G.
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
