Re: updating the wiki with a darcs push?
Ivan Zakharyaschev <[email protected]>
| Newsgroups | gmane.comp.version-control.darcs.user |
|---|---|
| Message-ID | <[email protected]> |
Hello! On Sun, 23 Jun 2013, Simon Michael wrote: > On 6/21/13 5:57 AM, Ivan Zakharyaschev wrote: >> As for me, I feel that it's my problem to figure out how to send the >> patches. So, I've received the answer that there is a way to submit >> changes to the wiki from the local clone. > > Another option is to publish your branch of the wiki on hub.darcs.net and > request that a wiki admin pull from it, which has some advantages. > > Maybe there should be an official wiki repo on hub for easy forking. > I've just set it up: http://hub.darcs.net/darcs/darcs-wiki . Thanks for it! It's useful for forking off and having a public place to save one's changes to the wiki (made in a repo, not through the web-interface, which is the preferred way to edit wikis for me.) > Like the darcs-screened and darcs-reviewed repos already on hub, it's > currently a one-way mirror from the official repos on darcs.net, updated > periodically (currently, on the hour). However, there are currently discrepancies between the content of the real wiki and the hub mirror, which I've just discovered -- http://bugs.darcs.net/issue2483 . So, the correct way to pull someone's changes for the wiki from hub.darcs.net would be to pull only the complement of his repo to the mirror repo. Example -- how not to pull the extra (spam) changes from a fork (imz's one) and also an interesting example of the usage of --complement: [imz@ovicaa darcs-wiki2]$ darcs pull --complement http://hub.darcs.net/imz/darcs-wiki http://hub.darcs.net/darcs/darcs-wiki --dry-run Would pull the following changes: patch c6ee1c26ddc1fcbb6b6ddded99ade9a773bfea98 Author: Ivan Zakharyaschev <[email protected]> Date: Wed Jun 19 01:51:50 MSK 2013 * tip: Invoking Emacs functions as external merge/diff tools. Preparing the args for an Emacs function in a shell script (as it is done in the manual) is ugly. Here I show how do it with Elisp code. patch 66383b0cb4abec8770687c00c1e8bd7c6dbc709f Author: Ivan Zakharyaschev <[email protected]> Date: Wed Dec 23 20:40:28 MSK 2015 * minor: correct formatting of code Making no changes: this is a dry run. [imz@ovicaa darcs-wiki2]$ Best regards, Ivan