feader wrote:I'm toying with the idea to use trunk, too. Since I have ttrss on a machine that has no X11: Is there a passable diff/merge tool for the command line, or would it be smarter to use a git that is installed on my PC and mount ttrsses directory there whenever I feel I should pull & update a new version?
You don't need X to use Git. I sure have never used their GUI components.
As for diffing in a terminal, e.g. vimdiff (included with Vim) works, and many others. I don't know what you want to diff, though; unless you also do development on the X-less server, there shouldn't be any manual merging going on. Git will solve that for you.
feader wrote:When I think about it: It would make a db dump much harder to accomplish, so I only do this when there is a merge? I'd like to have some local changes, like the number switch in the feed display, I have to commit those for a trouble free update, right?
If you want to keep local patches, you will have to apply them or, if they are of common interest, get them included in the mainline tree. In the latter case, you can use Github to issue a "pull request" to the project for the project maintainer to review. If these words mean nothing to you - read up. Github itself has excellent and thorough documentation.
If it concerns a one-line patch, you could probably just use the regular `patch` tool to apply it after pulling. Or keep a separate Git branch that you locally merge with master after pulls. DVCSs are famously good at managing merges like this automatically.
Concerning the db dump: When using mysql, should I install a script executing
Code: Select all
mysqldump -u ttrssuser -ppass ttrssdb > ttrssdump
as a update hook? And what happens when the db schema is updated, it is installed before the first login after update?
There is no need to use it as a update hook. Do your backups on the same schedule as before. If the database scheme version is incremented with a new TT-RSS version, this is automatically recognized and converted. If you would restore an old backup, this will be handled by TT-RSS on the first startup.
Last not least: Up to this point, I mostly used mercurial as distributed VS. I think I remember that it can also pull/push/etc from git repos, has anyone experiences with that scenario, or is this consired
It really should not be needed (I've used Mercurial a lot more than Git myself). You won't be doing any really advanced stuff, so its just a matter of learning a small number of new commands; often they are even the same.
See it as an opportunity to learn Git as well as
Mercurial. Using both makes one better at both.
There is an Hg-Git plugin for Mercurial that allows collaboration between the systems, but in really simple cases it should not be needed since its, well, simple anyway. In really complex situations you'd run into some trouble concerning subtle differences in Hg and Git's interpretation of concepts such as "branches", "tags", commit reversion, etc. The effort is better spent at learning Git than learning the ins and outs of some abstraction layer on top of Hg, imho.