![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | |
| Tue, 27 Sep 2011 17:54:59 +0000 (19:54 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Sep 2011 18:25:02 +0000 (11:25 -0700) | ||
| commit | 3c1ed90ec3973404ffcff99103faa5b863889f98 | |
| tree | 99e0dc93bd5a31ed693bfc2f3c8d44dfa5f629af | tree | snapshot |
| parent | ac86ec0f5e2dbd0d46fb000db1a65f1d2173a02d | commit | diff |
git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts
We already have a check that no new revisions are on the wiki at the
beginning of the push, but this didn't handle concurrent accesses to the
wiki.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We already have a check that no new revisions are on the wiki at the
beginning of the push, but this didn't handle concurrent accesses to the
wiki.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| contrib/mw-to-git/git-remote-mediawiki | diff | blob | history |