]> git.lyx.org Git - features.git/commitdiff
Doc & menu entry
authorPavel Sanda <sanda@lyx.org>
Wed, 7 Oct 2009 00:08:18 +0000 (00:08 +0000)
committerPavel Sanda <sanda@lyx.org>
Wed, 7 Oct 2009 00:08:18 +0000 (00:08 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31548 a592a061-630c-0410-9148-cb99ea01b6c8

lib/doc/Additional.lyx
lib/ui/stdmenus.inc

index 18586a9b237bb9b248f771c0113392928b9993a1..f8f32fd1d59c4318b5745613bca5b86d98083cd6 100644 (file)
@@ -18565,6 +18565,117 @@ svn revert -q
 
 \end_layout
 
+\begin_layout Subsubsection
+Synchronization of local directory checkout with repository
+\end_layout
+
+\begin_layout Standard
+All the commands above have one shortcomming - they deal with the current
+ document only.
+ Once your document contains pictures, includes external 
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+.tex
+\end_layout
+
+\end_inset
+
+ files and so on administration becomes more complicate.
+ LyX now supports updating the whole tree in which resides the document
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+One need to organize the files structure so that all external files are
+ in the same directory or subdirectories of the document.
+\end_layout
+
+\end_inset
+
+.
+ This become especially useful once you cooperate with people which neither
+ know about subversion management nor they have ambition to commit additional
+ material to the repository.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+Synchronize local directory with repository
+\end_layout
+
+\end_inset
+
+ command firstly reverts all local changes (to avoid merge conflicts aftwards)
+ and then updates the whole directory structure from the archive.
+ If local changes are detected user is warned before reversion starts.
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+SVN
+\begin_inset space ~
+\end_inset
+
+commands: 
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+svn diff $path
+\end_layout
+
+\end_inset
+
+ (Ask if changes are detected.)
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+svn revert -R $path
+\begin_inset Newline newline
+\end_inset
+
+svn update $path
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+where 
+\begin_inset Flex CharStyle:Code
+status collapsed
+
+\begin_layout Plain Layout
+$path
+\end_layout
+
+\end_inset
+
+ stands for the path to the document.
+\end_layout
+
 \begin_layout Subsubsection
 
 \family sans
index 7caf02ae8053ef1062f765849b71a739de28a70c..494c66ff8da28f1394b4de86841ffa9a5d998d17 100644 (file)
@@ -72,6 +72,7 @@ Menuset
                OptItem "Register...|R" "vc-register"
                OptItem "Check In Changes...|I" "vc-check-in"
                OptItem "Check Out for Edit|O" "vc-check-out"
+               OptItem "Synchronize local directory with repository" "vc-repo-synchro"
                OptItem "Revert to Repository Version|v" "vc-revert"
                OptItem "Undo Last Check In|U" "vc-undo-last"
                OptItem "Show History...|H" "dialog-show vclog"