[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Savannah-cvs] [124] Add more to git-svn wiki admin doc
From: |
Bob Proulx |
Subject: |
[Savannah-cvs] [124] Add more to git-svn wiki admin doc |
Date: |
Sun, 07 Dec 2014 19:50:10 +0000 |
Revision: 124
http://svn.sv.gnu.org/viewvc/?view=rev&root=administration&revision=124
Author: rwp
Date: 2014-12-07 19:50:07 +0000 (Sun, 07 Dec 2014)
Log Message:
-----------
Add more to git-svn wiki admin doc
Modified Paths:
--------------
trunk/sviki/HowToAdminThisWiki.mdwn
Modified: trunk/sviki/HowToAdminThisWiki.mdwn
===================================================================
--- trunk/sviki/HowToAdminThisWiki.mdwn 2014-12-07 19:09:05 UTC (rev 123)
+++ trunk/sviki/HowToAdminThisWiki.mdwn 2014-12-07 19:50:07 UTC (rev 124)
@@ -26,12 +26,21 @@
0. git svn clone --stdlayout svn+ssh://svn.savannah.gnu.org/administration
-0. Run `git commit` to commit to the local git repository.
+0. Edit the local sandbox of files normally.
-0. Run `git svn dcommit` to publish the results to the public Subversion
-repository.
+0. Run `git commit` to commit local changes to the local git repository.
+0. Run `git svn rebase` to fetch and rebase your local changes on top
+of any new upstream versions. (Use `git svn fetch` to only fetch
+upstream changes but not rebase merge them.)
+0. Run `git svn dcommit` to publish locally committed changes to the
+public Subversion repository. If due to a race with another upstream
+svn committer there is a conflict then `git svn rebase` again to pull
+their new upstream changes. Then push again with `git svn dcommit`.
+(This is the same as the `svn update' and `svn commit'.)
+
+
Wiki configuration
------------------
In the file `frontend:~sviki/ikiwiki.setup`. At present, we are using
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Savannah-cvs] [124] Add more to git-svn wiki admin doc,
Bob Proulx <=