On Tue, Sep 21, 2010 at 2:11 PM, Heinrich Huss < heinrich.h...@psh-consulting.de> wrote:
> But how is it, when I have added additional files to the latest version. I > do not see them with the diff command. > The current implementation just says the files are "ADDED". Maybe I should change that so that it shows ever line of the file as being added separately - a trivial "diff" that has "+" on every line of the file.... What do you think? Should I change the diff algorithm? > > Am 20.09.2010 10:54, schrieb Richard Hipp: > > > > On Mon, Sep 20, 2010 at 2:11 AM, Heinrich Huss < > heinrich.h...@psh-consulting.de> wrote: > >> Hi, >> >> I may have missed something obvious, but I cannot find a way to retrieve >> the difference between two versions of a project. >> >> fossil diff -R only show differences between files which had been >> checked in in both versions but not the added or deleted files. fossil >> changes does not have an option for a second revisions to compare to. >> >> The only way I found was to check out both versions in different >> directories and use an external diff tool (meld). >> >> What have I missed? >> > > From the command-line: > > fossil diff --from VERSION1 --to VERSION2 > > The --to VERSION2 can be omitted, in which case the difference will be to > the current checkout. So, for example, to find all changes between the > current checkout and the most recent version tagged "release", you could > type: > > fossil diff --from release | open -f > > The "| open -f" suffix is optional. On a Mac, the "| open -f" displays the > diff output in a text editor. The "| open -f" isn't really part of Fossil - > it is just a helpful hint. But I find "open -f" to be so helpful that I > wrote a script for my Linux boxes that works the same way, so that I don't > have to remember if I'm typing on Mac or Linux - "open -f" always works... > > Another example: To see all changes in your trunk branch during the month > of July: > > fossil diff --from trunk:2010-07-01 --to trunk:2010-08-01 | open -f > > From the web interface, use the "vdiff" method: > > http://www.fossil-scm.org/fossil/vdiff?from=release&to=trunk&detail=1 > > The "detail=1" causes a complete diff of every file to be shown. If you > omit the "detail=1" then you just get a list of the files that have changed, > with a link beside each one to see the individual differences. > > >> >> Thanks a lot. >> >> Regards >> Hein >> >> -- >> >> Heinrich Huss >> >> PSH Consulting GmbH >> Am Gewerbepark 10 >> 64823 Groß-Umstadt >> >> Phone +49 6078 931 6455 >> Fax +49 6078 96 9536 >> >> Mobile +49 171 43 46 773 >> e-mail heinrich.h...@psh-consulting.de >> >> *** PSH Consulting GmbH Legal Disclaimer *** >> >> Diese E-Mail einschließlich ihrer Anhänge ist vertraulich und ist >> allein für den Gebrauch durch den vorgesehenen Empfänger bestimmt. >> Dritten ist das Lesen, Verteilen oder Weiterleiten dieser E-Mail >> untersagt. Wir bitten, eine fehlgeleitete E-Mail unverzüglich >> vollständig zu löschen und uns eine Nachricht zukommen zu lassen. >> >> This email may contain material that is confidential and for the >> sole use of the intended recipient. Any review, distribution by others >> or forwarding without express permission is strictly prohibited. If you >> are not the intended recipient, please contact the sender and delete >> all copies. >> >> Hauptsitz: Magdeburger Strasse 1, D-64720 Michelstadt, USt-IdNr.: DE 21 >> 117 1171 >> Kommunikation: Telefon +49 6078 931 6455, Telefax +49 6078 96 95 36, >> www.psh-consulting.de >> Handelsregister: Amtsgericht Darmstadt, HRB 71404 >> Geschäftsführer: Heinrich Huss, Thomas Riedl >> >> >> >> >> >> >> _______________________________________________ >> fossil-users mailing list >> fossil-users@lists.fossil-scm.org >> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >> > > > > -- > D. Richard Hipp > d...@sqlite.org > > > _______________________________________________ > fossil-users mailing > listfossil-us...@lists.fossil-scm.orghttp://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > > -- > > Heinrich Huss > > PSH Consulting GmbH > Am Gewerbepark 10 > 64823 Groß-Umstadt > > Phone +49 6078 931 6455 > Fax +49 6078 96 9536 > > Mobile +49 171 43 46 773 > e-mail heinrich.h...@psh-consulting.de > > *** PSH Consulting GmbH Legal Disclaimer *** > > Diese E-Mail einschließlich ihrer Anhänge ist vertraulich und ist > allein für den Gebrauch durch den vorgesehenen Empfänger bestimmt. > Dritten ist das Lesen, Verteilen oder Weiterleiten dieser E-Mail > untersagt. Wir bitten, eine fehlgeleitete E-Mail unverzüglich > vollständig zu löschen und uns eine Nachricht zukommen zu lassen. > > This email may contain material that is confidential and for the > sole use of the intended recipient. Any review, distribution by others > or forwarding without express permission is strictly prohibited. If you > are not the intended recipient, please contact the sender and delete > all copies. > > Hauptsitz: Magdeburger Strasse 1, D-64720 Michelstadt, USt-IdNr.: DE 21 117 > 1171 > Kommunikation: Telefon +49 6078 931 6455, Telefax +49 6078 96 95 36, > www.psh-consulting.de > Handelsregister: Amtsgericht Darmstadt, HRB 71404 > Geschäftsführer: Heinrich Huss, Thomas Riedl > > > > > > > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > -- 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
