Thanks all for the feedback. Given the goal of getting everything onto a
two-sided Letter sized sheet of paper this one quick ref will always be a
bit of a compromise but hopefully still useful. I've incorporated some of
the feedback given thus far:
1. Added diff -y
2. Fixed some typos
3. Added qualification that this quickref is primarily for Unix/Linux
(maybe a Dos/Windows specific one can be created also?)
4. Added the --branch method for merge
5. slightly re-worded some sections, added hint that delta == changes
Regarding keeping up with the latest fossil, with five different
machines/environments to keep up to date and in sync I will only use
officially released binaries for the foreseeable future. However I do watch
the mailing list for updates. I think the released version probably does
have the side-by-side diffs but I've fallen behind on updating all machines.
Note on the "safe and unambiguous move". Fossil may want to use rsync as a
template for move/copy behavior. With rsync you can lock down the meaning
of a directory copy by using a trailing slash:
;; ambiguous depending on whether dirb exists or not
rsync -avz dira dirb
;; unambigously puts contents from dira into dirb (exact behavior as no
trailing slashes when dirb does not exist):
rsync -avz dira/ dirb/
Note on ssh:// URL. I knew that ssh access did not work with fsecure but I
just tested it and can't get it to work with openssh. If someone can
confirm that using ssh as a transport mechanism is working for them and
provide me with an example URL I'd appreciate it.
Thanks,
Matt
-=-
On Fri, Nov 25, 2011 at 1:50 AM, Richard Hipp <d...@sqlite.org> wrote:
> On Fri, Nov 25, 2011 at 6:21 AM, Matt Welland <estifo...@gmail.com> wrote:
>
>>
>> I don't have -y documented in my current version of fossil and assume it
>> isn't there. As soon as I've learned what it is I'll look at adding it.
>>
>
> The -y option (side-by-side diff) is a new feature since version 1.20. It
> seems to me like I've been using it forever, so I guess that means its
> about time to do a new release, huh?
>
> Anyway, I always do:
>
> fossil diff -y | open -f
>
> prior to check-in to see side-by-side differences. The "open -f" part
> works on a mac. But it is so useful that I have my own hack of an
> implementation for linux as well.
>
> Note that the tip of trunk on Fossil is almost always ready to use and in
> active use by me. The version of Fossil running the Fossil website is
> usually close to tip-of-trunk.
>
>
>
> --
> 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
>
>
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
