anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Sounds better

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31619 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2009-10-14 19:35:54 +00:00
parent dd82560e85
commit 32d48ba0d7
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/doc/Additional.lyx
View File

@ -18589,7 +18589,7 @@ name "sub:SVN-Repo-Update"
\end_inset \end_inset
Update of the local directory checkout with repository Update of the local directory checkout from repository
\begin_inset Foot \begin_inset Foot
status collapsed status collapsed
@ -18644,14 +18644,15 @@ One need to organize the files structure so that all external files are
status collapsed status collapsed
\begin_layout Plain Layout \begin_layout Plain Layout
Synchronize local directory with repository Update local directory from repository
\end_layout \end_layout
\end_inset \end_inset
command firstly reverts all local changes (to avoid merge conflicts aftwards) command updates the whole directory in which resides your document.
and then updates the whole directory structure from the archive. In case of merge conflicts local version of the files are left, so no unintende
If local changes are detected user is warned before reversion starts. d data loss occurs.
If local changes are detected user is warned before update starts.
\end_layout \end_layout
\begin_layout Labeling \begin_layout Labeling

2
lib/ui/stdmenus.inc
View File

@ -72,7 +72,7 @@ Menuset
OptItem "Register...|R" "vc-register" OptItem "Register...|R" "vc-register"
OptItem "Check In Changes...|I" "vc-check-in" OptItem "Check In Changes...|I" "vc-check-in"
OptItem "Check Out for Edit|O" "vc-check-out" OptItem "Check Out for Edit|O" "vc-check-out"
OptItem "Update local directory with repository" "vc-repo-update" OptItem "Update local directory from repository" "vc-repo-update"
OptItem "Revert to Repository Version|v" "vc-revert" OptItem "Revert to Repository Version|v" "vc-revert"
OptItem "Undo Last Check In|U" "vc-undo-last" OptItem "Undo Last Check In|U" "vc-undo-last"
OptItem "Show History...|H" "dialog-show vclog" OptItem "Show History...|H" "dialog-show vclog"

2
lib/ui/stdtoolbars.inc
View File

@ -258,7 +258,7 @@ ToolbarSet
Separator Separator
Item "Use SVN file locking property" "vc-locking-toggle" Item "Use SVN file locking property" "vc-locking-toggle"
Separator Separator
Item "Update local directory with repository" "vc-repo-update" Item "Update local directory from repository" "vc-repo-update"
End End
Toolbar "math_panels" "Math Panels" Toolbar "math_panels" "Math Panels"