VFP 愛用者社區

[朱育興]

如何：將專案置於版本管理之下


在您利用版本管理軟體之前，版本管理必須指定一個 Visual FoxPro 專案。這需要將專案新增到您的版本管理系統中。

如果已經啟用了版本管理軟體，您可以指定您建立的任何新專案自動置於版本管理之下。



如何建立一個新的版本管理專案

1.在[選項]對話方塊中，選取[專案]標籤，如果您還沒有選取版本管理系統，這時需要選取一個。

2.確認已經選取了[自動加入新的專案到版本管理]，然後選取[確定]。若想令這個設定成為預設的，請選取[設定為預設值]，然後選取[確定]。

3.從[檔案] 功能表中選取[開新檔案]命令，然後開始設計一個新的 Visual FoxPro 專案。

當您為新專案命名之後，Visual FoxPro 就會提示您建立一個相對應之版本管理的新專案。新專案的預設名稱將與 Visual FoxPro 專案的名稱相同。



建立了新的版本管理專案之後，Visual FoxPro 就完成了這個 Visual FoxPro 專案的建立工作。其他開發者須先得到允許才能使用該專案。

如果有一個已存在的專案，但它還沒有被置於版本管理之下，您可以為它建立一個新的版本管理專案，然後將它的檔案置於版本管理之下。


如何將一個已存在專案置於版本管理之中

1.在[專案管理員]視窗中開啟您的 Visual FoxPro 專案。

2.從[專案]功能表中，選取[將專案加到版本管理中]命令。

Visual FoxPro 為您的版本管理系統顯示對話方塊，這樣您可以建立一個新專案。預設情況下，版本管理專案的名稱與 Visual FoxPro 專案的名稱相同。

3.在您的版本管理軟體中，像平常一樣建立一個版本管理的專案。


當您向版本管理系統中新增一個已經存在的專案之後，Visual FoxPro 會提醒您將專案檔新增到版本管理的專案中。



相關資訊

如何：向版本管理專案新增檔案

在版本管理系統下管理 Visual FoxPro 專案

如何：更新專案清單

如何：連結已經存在的版本管理專案

團隊開發專案計畫




----------------------------------------------------------------------------------------------
原文：


How to: Put Projects Under Source Control


You must specify that a Visual FoxPro project will be source-controlled before you can take advantage of your source control software. You do this by adding a project to your source control system.

If source control software is enabled, you can specify that any new projects you create be automatically put under source control.



To create a new source-controlled project

1.In the Options dialog box, choose the Projects tab, and then select a source code control provider if you haven't already done so.

2.Make sure Automatically add new projects to source control is selected, and then choose OK. To make this setting the default, choose Set as Default, and then choose OK.

3.From the File menu, choose New, and then start a new Visual FoxPro project.

After you've named the new project, Visual FoxPro will prompt you to create the new source-controlled project. The default name for the new project will be the same as the name of the Visual FoxPro project.



After you create the new source-controlled project, Visual FoxPro finishes creating the Visual FoxPro project. Before other developers can use the file, they must enlist in the project.

If you're working with an existing project that isn't already under source control, you can create a new source-controlled project for it, and then put its files under source control.


To put an existing project under source control

1.Open your Visual FoxPro project in the Project Manager Window.

2.From the Project menu, choose Add Project to Source Control.

Visual FoxPro displays the dialog box for your source control system that allows you to create a new project. By default, the name of the source-controlled project is the same as that of the Visual FoxPro project.

3.Create the source-controlled project as you normally do with your source control software.


When you add an existing project to source control, Visual FoxPro prompts you to add the project's files to the source-controlled project.



See Also

How to: Add Files to a Source-Controlled Project

Managing Visual FoxPro Projects Under Source Control

How to: Update the Project List

How to: Join an Existing Source-Controlled Project

Planning for Team Development Projects

[朱育興]

如何：向版本管理專案新增檔案


將 Visual FoxPro 專案置於版本管理專案中之後，您可以將單獨的檔案新增到版本管理的專案中。如果在您將 Visual FoxPro 專案置於版本管理專案中的時候，已經包含了檔案，您也可以將它們新增到版本管理的專案中。

注意：
有的版本管理軟體允許把檔案加到版本管理專案中時，仍保持這些檔案是簽出的。對於另外一些版本管理軟體，必須在把檔案加入到版本管理專案後再手動地簽出它們，才能對其處理。處理有關將檔案新增到專案中去之後簽出和簽入檔案的詳細內容，請參閱在「在版本管理專案中管理檔案」。



如何在版本管理專案中增加既存的檔案

1.從[專案]功能表中，選取[版本管理]命令，然後選取[將檔案加至版本管理中]命令。

2.在[往版本管理中加入檔案]對話方塊中選取您想新增的檔案。

注意：
只有您的版本管理軟體支援時，[保持簽出狀態]和[註解]才會出現。

3.選取[確定]按鈕。


Visual FoxPro 為版本管理軟體產生必要的控制檔案，然後將這些檔案新增到專案中。如果您選取了很多檔案，這個過程會需要一段時間。



您可以設定當您向一個專案中新增檔案時，由 Visual FoxPro 提醒您將這個檔案置於版本管理之下。


如何讓 Visual FoxPro 提醒您將新檔案置於版本管理之中

•在[選項]對話方塊的[專案]標籤中，確定[自動加入新的專案到版本管理]是選定的，然後選取[確定]。

若想令這個設定成為預設的，請選取[設定為預設值]，然後選取[確定]。


在您將檔案新增到專案中之後，您必須更新專案清單，這樣其他開發者才能處理這些新檔案。



相關資訊

如何：更新專案清單

團隊開發專案計畫

在版本管理系統下管理 Visual FoxPro 專案

如何：將一個專案從版本管理中解除

如何：連結已經存在的版本管理專案




----------------------------------------------------------------------------------------------
原文：


How to: Add Files to a Source-Controlled Project


After you put a Visual FoxPro project under source control, you can add individual files to the source-controlled project. If the Visual FoxPro project already contains files when you put it under source control, you can add them to the source-controlled project.

Note:
If the source control software supports it, Visual FoxPro allows you to keep the file checked out when you add it to the source-controlled project. If not, the file is checked in and you must check it out again in order to work with it. For details about checking files out and in after they're added to a project, see Managing Files in a Source-Controlled Project.



To add existing files to a controlled project

1.From the Project menu, choose Source Control and then choose Add Files to Source Control.

2.In the Add Files to Source Control Dialog Box, select the files you want to add.

Note:
Keep checked out and Comment appear only if your source code control software supports these options.

3.Choose OK.


Visual FoxPro generates the control files necessary for the source control software, and then adds the files to the project. If you've selected many files, this process can take some time.



You can set it up so that when you add a file to a project, Visual FoxPro will prompt you to put it under source control.


To specify that Visual FoxPro prompts you to put new files under source control

•In the Projects tab of the Options dialog box, make sure Automatically add new projects to source control is selected, and then choose OK.

To make this setting the default, choose Set as Default, and then choose OK.


After you've added files to a project, you must update the project list before other developers can work with the new files.



See Also

How to: Update the Project List

Planning for Team Development Projects

Managing Visual FoxPro Projects Under Source Control

How to: Detach a Project from Source Control

How to: Join an Existing Source-Controlled Project

[朱育興]

如何：連結已經存在的版本管理專案


如果您剛剛加入一個已經由版本管理的專案，您在簽出和簽入檔案之前必須先加入這個專案。當您加入一個專案時，Visual FoxPro 為您建立一個本地電腦專案清單，並且產生一個專案檔 (.pjx 檔案)。



如何連結已經存在的專案

1.從[檔案] 功能表中選取[連結版本管理專案]命令。

2.從[開啟專案]對話方塊中，選取所有你想加入的 Visual FoxPro 專案檔的伺服器和目錄。

3.在您的本地電腦上設定工作目錄，這指定了當您簽出檔案時，版本管理系統放置這些檔案的位置，並且指定了當您簽入檔案時，版本管理系統要到何處去尋找這些檔案。例如，如果您使用 Visual SourceSafe 作為您的版本管理軟體，可以從目錄區選取[browse]，然後選取一個既存的目錄，或者鍵入新目錄的名稱。

提示：
對於專案中的檔案，雖然單一子目錄的名稱可以不同，但是一個專案中的所有開發者必須使用相同的目錄結構。



相關資訊

團隊開發專案計畫

在版本管理系統下管理 Visual FoxPro 專案

如何：將一個專案從版本管理中解除

如何：更新專案清單




----------------------------------------------------------------------------------------------
原文：


How to: Join an Existing Source-Controlled Project


If you are a new developer on a project that's already under source control, you must join the project before you can check files out and in. When you join a project, Visual FoxPro creates a local project list file and generates a current project file (.pjx file) for you.



To join an existing project

1.From the File menu, choose Join Source Control Project.

2.In the Open Project dialog box, select the server and directory that contains the Visual FoxPro project file you want to join.

3.Set the working directory on your local machine; this specifies where the source control system will place files when you check them out and where it will look when you check them back in. For example, if you're using Visual SourceSafe as your source control provider, choose Browse from the Directory area and select an existing directory, or type the name of a new directory.

Tip:
All developers on a project must use the same directory structure for the files in a project, although the names of individual subdirectories can differ.



See Also

Planning for Team Development Projects

Managing Visual FoxPro Projects Under Source Control

How to: Detach a Project from Source Control

How to: Update the Project List

[朱育興]

如何：更新專案清單


將檔案新增到版本管理專案之後，在其他開發者的專案管理員上仍無法看見這些檔案。其他開發者只能手動地簽出這些檔案，處理完以後再簽入。但如果您更新了專案清單，新增的檔案就可以出現在其他開發者的專案管理員中，供他們使用。

當您更新專案清單時，Visual FoxPro 會進行下列處理︰

•建立一個新的本地電腦專案清單 (.pjm 檔案)。
•簽入新的專案清單 (選項設定為[保持簽出狀態])。
•如果二者有區別，就合併本地電腦和中心專案清單。 如果合併發生衝突，Visual FoxPro 就會顯示一個對話方塊，幫助您解決合併衝突。
•根據合併後的專案清單重建本地電腦專案 (.pjx) 檔案。
•取得其他開發者新增到專案中的本地電腦檔案備份。
•提醒您得到專案檔的最新版本。
•重新整理[專案管理員]的顯示，以反應更新後的內容。



如何更新專案清單

•從[專案]功能表中選取[版本管理]，然後選取[更新專案清單]命令。

在更新程序中，Visual FoxPro 提醒您取得檔案的最新版本。如果您已經簽出了一個檔案，那麼您的這個檔案的版本可以肯定比網路上的要新，所以不用更新它。

如果您得到的是文字檔的最新版本 (例如一個程式)，版本管理軟體會嘗試合併最新版本和您的版本。有關合併文字檔的詳細內容，請參閱「如何：簽入檔案」。

當您更新完專案清單之後，為了能處理您新增的檔案，其他開發者也應該更新他們的專案清單 (使用相同的程序)。



相關資訊

團隊開發專案計畫

在版本管理系統下管理 Visual FoxPro 專案

如何：將一個專案從版本管理中解除

如何：連結已經存在的版本管理專案




----------------------------------------------------------------------------------------------
原文：


How to: Update the Project List


Even after files have been added to the source-controlled project, other developers will not be able to work with them. Developers will be able to manually use their source control system to check files out and in if they need to, but the added files will not be displayed in the Project Manager for any developer except the developer who added the files. To make the files available to other developers, update the project list.

When you update the project list, Visual FoxPro:

•Generates a new local project file list (.pjm file).
•Checks in the new project file list (with the option set to keep the file checked out).
•Merges the local and central project file lists if there are differences. If a merge conflict occurs, Visual FoxPro displays a dialog box to help you resolve the merge conflicts.
•Rebuilds the local project (.pjx) file based on the merged project file list.
•Gets local copies of files added to the project by other developers.
•Prompts you to get the latest versions of the project files.
•Refreshes the display in the Project Manager to reflect changes.

To update the project list

•From the Project menu, choose Source Control, and then choose Update Project List.

As part of the update procedures, Visual FoxPro prompts you to get the latest versions of files. If you have a file already checked out, as a general rule you shouldn't get the latest version, because your version is almost certainly more current than the one on the network.

If you're getting the latest version of a text file (such as a program), the source control software can attempt to merge the latest changes with your version. For more information about merging text files, see How to: Check In Files.

When you're finished, other developers should also then update their project list (using the same procedure) in order to be able to work with the files you've added.



See Also

Planning for Team Development Projects

Managing Visual FoxPro Projects Under Source Control

How to: Detach a Project from Source Control

How to: Join an Existing Source-Controlled Project

[朱育興]

如何：將一個專案從版本管理中解除


如果不再想控制專案中的檔案，您可以將專案從版本管理中解除。當您這樣作了之後，檔案仍然保留在版本管理專案中，這樣其他開發者可以繼續使用它們，而且您也可以驗證檔案的歷程記錄，或者在其他專案中使用它們。

如果在您的電腦上有標示為唯讀的專案檔，也就是說，您擁有這些檔案的備份，但是沒有簽出它們，當專案從版本管理中解除後，您可以去掉它們的唯讀特性。

注意：
當您將一個專案從版本管理中解除時，就將您本地電腦專案檔和版本管理專案之間的聯繫中斷了，並且您的本地電腦檔案變成可讀寫的。在版本管理解除專案之後，要確保建立手動的版本控制程序，否則可能含有不在版本管理處理的檔案。



如何將一個專案從版本管理中解除

1.簽入所有版本管理的檔案。

2.從[專案]功能表中，選取[從版本管理中分離出專案]命令。



相關資訊

如何：更新專案清單

如何：從版本管理專案中移除檔案

團隊開發專案計畫

在版本管理系統下管理 Visual FoxPro 專案




----------------------------------------------------------------------------------------------
原文：

How to: Detach a Project from Source Control


If you no longer want to control the files in a project, you can detach the project from source control. When you do so, files remain in the source control project so that other developers can continue to use them and so you can examine their history or use them with other projects.

If you have project files on your computer that are tagged as read-only — that is, you have copies of files, but they're not checked out — you can remove their read-only attribute when the project is detached from source control.

Note:
When you detach a project from source control, you break the link between your local project files and the source-controlled project, and your local files become read/write. Be sure to institute manual version control procedures after detaching the project, or you run the risks inherent in working with files that are not under source control.



To detach a project from source control

1.Check in all the files under source control.

2.From the Project menu, choose Detach Project from Source Control.



See Also

How to: Update the Project List

How to: Remove Files from a Source-Controlled Project

Planning for Team Development Projects

Managing Visual FoxPro Projects Under Source Control

[朱育興]

如何：從版本管理專案中移除檔案


如果您在版本管理專案中不再想包含某些檔案，您可以從版本管理下移除它們。例如，當您的專案已不再使用一個已過時的程式或表單時，您可能會需要這樣做。



如何從版本管理中移除一個檔案

1.在[專案管理員]視窗中，選取要移除的檔案。

2.從[專案]功能表中選取[版本管理]，然後選取[從版本管理中刪除檔案]命令。

3.在[從版本管理刪除檔案]對話方塊中，選取要移除的檔案，然後按一下[確定]按鈕。

如果您從版本管理中的 Visual FoxPro 專案裡面移除了一個檔案，Visual FoxPro 會提醒您是要從專案中移除檔案還是從磁碟上刪除檔案。選項對話方塊中的一個設定也決定了 Visual FoxPro 是否也提醒您從版本管理專案中移除這個檔案。

•如果選定了[透過從專案中的移除功能—從版本管理中刪除檔案]，Visual FoxPro 也提醒您從版本管理專案中移除檔案。
•如果沒有選定[透過從專案中的移除功能—從版本管理中刪除檔案]，Visual FoxPro 就不會提醒您，檔案仍然在版本管理之下。

在檔案從版本管理之中移除後，在其他開發者的電腦上可能還存在它的備份。如果是這樣，該檔案只是被當成那些開發者的本地電腦檔案。



相關資訊

如何：將一個專案從版本管理中解除

如何：在多個版本管理專案之間共用檔案

團隊開發專案計畫

在版本管理系統下管理 Visual FoxPro 專案




----------------------------------------------------------------------------------------------
原文：

How to: Remove Files from a Source-Controlled Project


You can remove individual files from source control if you no longer want them to be part of your source-controlled project. You might do this, for example, if a program or form becomes obsolete and is no longer part of your project



To remove a file from source control

1.In the Project Manager Window, select the file to remove.

2.From the Project menu, choose Source Control, and then choose Remove Files from Source Control.

3.In the Remove Files from Source Control Dialog Box, select the files to remove, and then click OK.

If you remove a file from a Visual FoxPro project that's under source control, Visual FoxPro prompts you whether you want only to remove the file from the project or to delete it from disk. A setting in the Options dialog box determines whether Visual FoxPro also prompts you to remove the file from the source-controlled project.

•If Remove files from source control upon removal from project is checked, Visual FoxPro also prompts you to remove the file from the source-controlled project.
•If Remove files from source control upon removal from project isn't checked, you're not prompted, and the file is left under source control.

After a file has been removed from source code control, copies of it might still exist on other developers' computers. If so, the file is treated as a local file only for those developers.



See Also

How to: Detach a Project from Source Control

How to: Share Files Between Source-Controlled Projects

Planning for Team Development Projects

Managing Visual FoxPro Projects Under Source Control

[朱育興]

如何：在多個版本管理專案之間共用檔案


您可以建立一個檔案，它同時是兩個或多個版本管理專案的成員。共用檔案一般為公用檔案，例如多個專案中的標準程式、函數庫、或對話方塊。當您在專案之間共用檔案時，您簽入時的變更會在所有共用該檔案的專案中反應出來。

在版本管理專案之間共用檔案的方法取決於您的版本管理軟體。如果您的版本管理系統不支援共用選項，則在功能表上就不會有檔案共用命令。

下面程序的第一步適用於所有支援檔案共用的版本管理系統。接下來的步驟可能會不同，這取決於您的版本管理軟體。



如何在版本管理專案之間共用檔案

1.從[專案]功能表中選取[版本管理]，然後選取[共用檔案]命令。

2.在出現的對話方塊中，指明您想共用哪些檔案，並且它們目前屬於哪個專案。

功能表上出現的特定選項取決於您的版本管理系統。有關詳細內容，請在[共用]對話方塊中選取[說明]，或者參考您的版本管理系統的文件。

提示：
在 Microsoft Visual SourceSafe 中，使用[專案屬性]命令並且選取[連結標籤，您可以搜尋一個檔案屬於哪個專案。如果把一個專案加入到 Visual SourceSafe，為了正確對應到專案，包含在專案中的所有檔案必須是在專案目錄或路徑中。



相關資訊

如何：從版本管理專案中移除檔案

在版本管理專案中管理檔案

團隊開發專案計畫

在版本管理系統下管理 Visual FoxPro 專案




----------------------------------------------------------------------------------------------
原文：


How to: Share Files Between Source-Controlled Projects


You can set up a file so that it's a member of two or more source-controlled projects at the same time. This is useful if you use common files, such as standard programs, libraries, or dialog boxes, in more than one project. When you share files between projects, changes you check in to a file are reflected in all the projects that share the file.

The specific method for sharing files between source-controlled projects depends on your source control software. If file sharing options aren't supported by your source control provider, file sharing commands will not be available on the menu.

The first step of the following procedure applies to all source control systems that support file sharing. The subsequent steps might differ, depending on your source control software.



To share files between controlled projects

1.From the Project menu, choose Source Control and then choose Share Files.

2.In the dialog box that appears, indicate what files you want to share with your current project, and what project they currently belong to.

The specific options available from this menu command depend on your source control system. For details, choose Help in the Share dialog box or refer to the documentation for your source control system.

Tip:
In Microsoft Visual SourceSafe, you can see what projects a file is a member of by using the Project Properties command and choosing the Links tab. If you add a project to Visual SourceSafe, for proper mapping to the project, all files contained in the project must be in the project directory or path.



See Also

How to: Remove Files from a Source-Controlled Project

Managing Files in a Source-Controlled Project

Planning for Team Development Projects

Managing Visual FoxPro Projects Under Source Control

[朱育興]

在版本管理專案中管理檔案


當您將一個 Visual FoxPro 專案置於版本管理之中以後，您既可以處理單一的檔案，也可以處理整個專案。



在本章節中


處理多檔案元件

闡述某些專案檔如何由多重元件所組成以及 Visual FoxPro 將如何自動管理隱含檔案。


如何：簽出檔案

描述該如何在版本管理專案中簽出檔案。


如何：簽入檔案

描述該如何在版本管理專案中簽入檔案。


如何：放棄變更

描述該如何撤銷簽出以便對檔案的任何變更將會被放棄。


如何：取得檔案的最新版本

描述該如何取得已簽出的檔案之最新版本。


如何：比較檔案或專案

說明該如何在版本管理環境中比較檔案或專案是否被另一個使用者變更了，以及如何明確找到最後一次簽出之後是否有作過變更。


如何：驗證表單、報表和其他資料表格檔案的區別

描述該如何比較表單、報表和資料表格檔案是否有作過變更。


如何：顯示檔案和專案資訊

討論該如何檢視檔案或專案清單的簽出歷程記錄或版本管理訊息。



相關章節


團隊開發專案計畫

描述如何使用版本管理軟體來管理專案中的檔案，例如 Microsoft Visual SourceSafe，把一組具有技術能力的開發者結合在一起，可以快速建立出複雜的應用程式。




----------------------------------------------------------------------------------------------
原文：


Managing Files in a Source-Controlled Project


After you have put a Visual FoxPro project under source control, you can work with individual files or manage the project as a whole.



In This Section


Working with Multi-File Components

Covers how some project files consist of multiple components and how Visual FoxPro will manage the implicit file or files automatically.


How to: Check Out Files

Describes how to check out a file in a source-controlled project.


How to: Check In Files

Describes how to check in a file in a source-controlled project.


How to: Discard Changes

Describes how to undo a check out so that any changes to the file will be discarded.


How to: Get the Latest Versions of Files

Describes how to get the latest version of a file that is already checked out.


How to: Compare Files or Projects

Explains how to compare files or projects in a source controlled environment to determine whether another user has changed it, or to pinpoint where changes have been made since the last time it was checked out.


How to: Check for Differences in Forms, Reports, and Other Table Files

Describes how to compare files that represent form, report, and table files, to determine where changes have been made.


How to: Display File and Project Information

Discusses how to view the check out history or source control information of a file or project list.



Related Sections


Planning for Team Development Projects

Discusses how using source control software, such as Microsoft Visual SourceSafe, to manage the files in a project makes it possible to create complex applications quickly by combining the skills of a team of developers.

[朱育興]

處理多檔案元件


Visual FoxPro 中的部份專案元件實際上是由多個檔案組成的︰一個主程式和一個或多個隱含檔案。例如，當您建立一個表單時，Visual FoxPro 建立一個 .scx 檔案 (主程式) 以及 .sct 檔案 (隱含檔案)。下面的元件具有多個檔案︰

------------------------------------------
元件　　　　　 主程式型態 隱含檔案型態
-------------- ---------- ----------------
表單　　　　　 .scx　　　 .sct
報表　　　　　 .frx　　　 .frt
標籤　　　　　 .lbx　　　 .lbt
類別定義函數庫 .vcx　　　 .vct
功能表　　　　 .mnx　　　 .mnt
資料表格　　　 .dbf　　　 .fpt, .cdx, .idx
資料庫　　　　 .dbc　　　 .dct, .dcx
------------------------------------------

當一個開發者簽出一個元件檔案時，例如一個表單，Visual FoxPro 也管理相對的隱含檔案。類似地，當簽入一個檔案時，或者新增一個檔案時，Visual FoxPro 自動管理隱含檔案。

注意：
如果您產生或編譯連結一個功能表，您就建立了本地電腦的 .mpr 檔案以及 .mpx 檔案。它們並不自動處於版本管理下，但是您可以將它們作為檔案新增到您的專案中，並且像其他檔案一樣將它們置於版本管理之下。



簽入文字檔

當您簽入一個文字檔時，例如 .prg 檔案，如果簽出了該檔案的多個版本，版本管理軟體並不僅是覆蓋中心版本的檔案，除此之外，它還會驗證在您最後簽出該檔案之後是否有人對該檔案作了變更。如果有，它會嘗試將這些變更與您的檔案合併。 也就是說，它在您的檔案備份中新增、移除和變更一些內容。

當完成合併之後，版本管理軟體還會給您機會，讓您將檔案簽入。不要立即簽入您的檔案，請先彙整您和其他開發者的新版檔案並測試您的應用程式。當您對應用程式的正確執行感到滿意時，再簽入您的檔案。如果其他開發已經變更了相同的檔案，您還得再次合併、測試和簽入。

在某些情況下，版本管理軟體可能會顯示一個合併衝突訊息，這表示它無法解決您與其他開發者各自所作的變更之間的矛盾。例如，您和另一個開發者更新了同一個程式的同一列。如果版本管理軟體無法成功地合併，它會建立一個新版本的檔案，這個檔案包括原來的文字加上您作的變更，標示衝突，並將該檔案寫到您的電腦上 (如何標示衝突取決於您使用的版本管理軟體)，然後這個檔案出現在專案管理員中，並且帶有一個合併衝突圖示：


為了解決合併衝突，您必須重新編輯、修改這個檔案，移除合併衝突標識符號。當您完成編輯時，Visual FoxPro 會提醒您確認已經解決了所有衝突。然後在專案管理員中該檔案就會用合併圖示標識：


測試您的應用程式，確保變更能正常工作。然後，您可以試著重新簽入檔案。如果沒有發生合併衝突，您的檔案就成為該檔案目前的版本。



相關資訊

在版本管理專案中管理檔案

如何：簽入檔案

團隊開發專案計畫

[選項]對話方塊 (Visual FoxPro)




----------------------------------------------------------------------------------------------
原文：


Working with Multi-File Components


Some project components in Visual FoxPro actually consist of multiple files: a primary file and one or more implicit files. For example, when you create a form, Visual FoxPro creates an .scx file (the primary file) and an .sct file (the implicit file). The following components have multiple files:

-----------------------------------------------------
Component　　 Primary file type Implicit file type(s)
------------- ----------------- ---------------------
Form　　　　　.scx　　　　　　　.sct
Report　　　　.frx　　　　　　　.frt
Label　　　　 .lbx　　　　　　　.lbt
Class Library .vcx　　　　　　　.vct
Menu　　　　　.mnx　　　　　　　.mnt
Table　　　　 .dbf　　　　　　　.fpt, .cdx, .idx
Database　　　.dbc　　　　　　　.dct, .dcx
-----------------------------------------------------

When a developer checks out a component file, such as a form, Visual FoxPro also manages the corresponding implicit file or files. Likewise, when a file is checked back in, or a new file added, Visual FoxPro manages the implicit file or files automatically.

Note:　
If you generate and compile a menu, you create local .mpr and .mpx files as well. These aren't initially under source control, but you can add them as files to your project, and then put them under source control as you would other files.



Checking In Text Files

When you check in a text file such as a .prg file, and if multiple versions of the file are checked out, the source control software doesn't simply overwrite the central version. Instead, it checks whether there have been changes to the file since you last checked it out. If so, it attempts to merge those changes with your file. To do so, it adds, deletes, and changes lines in your copy of the file.

When it's finished merging, the source control software might also give you the opportunity to check in your file. Don't check in your file right away. Instead, test your application using the new version of the file that incorporates both your changes and those of other developers. Only when you're satisfied that the application works correctly, check in your file. If other developers have made further changes to the same file, you might have to merge, test, and check in again.

In some instances, the source control software might report a merge conflict, which indicates that it cannot resolve changes between your changes and those of other developers. This can occur, for example, if you and another developer have been updating the same lines of the same program. If the source control software cannot merge successfully, it creates a version of the file that contains the original text plus your changes, marks the conflicts, and writes that file to your computer. (The exact means by which the conflicts are marked depends on the source control software you're using.) The file then appears in the Project Manager with a merge conflict icon:


To resolve the merge conflict, you must edit the file again, make your changes, and remove the merge conflict markers. When you're finished editing, Visual FoxPro prompts you to confirm that you've resolved all conflicts. The file is then marked with the merge icon:


Test your application to be sure that the changes are working properly. You can then attempt to check the file in again. If no more merge conflicts occur, your file becomes the current version.



See Also

Managing Files in a Source-Controlled Project

How to: Check In Files

Planning for Team Development Projects

Options Dialog Box (Visual FoxPro)

[朱育興]

如何：簽出檔案


當您處理一個版本管理的專案時，如果你開啟相對的編輯程式來修改它們，Visual FoxPro 會提醒您簽出檔案。例如，如果您選取一個表單，並且選取[修改]按鈕來開啟[表單設計工具]，Visual FoxPro首先會提醒您簽出表單的檔案。(如果您不簽出檔案，表單也會在[表單設計工具]中顯示，但它是唯讀的。)

但是，您也可以手動簽出檔案，如果您只想單純地取用檔案，而不想在這個時候開啟編輯程式時，這個特性就很有用，例如，當您想離線處理一個檔案的時候。



如何讓 Visual FoxPro 在修改時提醒您簽出檔案

•在[選項]對話方塊的[專案]標籤中，確保選取了[修改後簽出檔案]選項，然後選取[確定]。

若想令這個設定成為預設的，請選取[設定為預設值]，然後選取[確定]。



如何手動簽出檔案

1.在[專案管理員]中，選取要處理的檔案。

2.從[專案]功能表中選取[版本管理]，然後選取[簽出]命令。

3.在[簽出檔案]對話方塊中，選取您想處理的檔案，然後按一下[確定]按鈕。



相關資訊

在版本管理專案中管理檔案

如何：簽入檔案

團隊開發專案計畫

[選項]對話方塊 (Visual FoxPro)




----------------------------------------------------------------------------------------------
原文：


How to: Check Out Files


When you're working in a source-controlled project, Visual FoxPro can prompt you to check files out when you modify them by opening the appropriate editor. For example, if you select a form and choose Modify to open the Form Designer, Visual FoxPro can first prompt you to check out the files for the form. (If you don't check out the files, the form is displayed in the Form Designer, but is read-only.)

However, you can also check out files manually, which is useful if you want exclusive access to the file, but don't want to open the editor for the file just at the moment. You might do this, for example, if you intend to work with a file offsite.



To specify Visual FoxPro to prompt you to check out files being modified

•In the Projects tab of the Options dialog box, make sure the option Check out files upon modify is checked, then choose OK.

To make this setting the default, choose Set as Default, and then choose OK.



To check out a file manually

1.In the Project Manager, select the file to work with.

2.From the Project menu, choose Source Control, and then choose Check Out.

3.In the Check Out Files Dialog Box, select the file or files you want to work with, and then click OK.



See Also

Managing Files in a Source-Controlled Project

How to: Check In Files

Planning for Team Development Projects

Options Dialog Box (Visual FoxPro)

[朱育興]

如何：簽入檔案


您只能手動簽入檔案。Visual FoxPro 無法自動簽入檔案，例如，當您關閉[表單設計工具]時，Visual FoxPro 並不簽入表單。相反，該檔案仍是簽出的，這樣您就可以繼續編輯它、暫時不處理它或者用其他模式處理它。

簽入程序的實際結果取決於您要簽入的檔案和您的版本管理軟體。對於表單、功能表、標籤、類別定義函數庫和其他型態的檔案，都被當做二進位檔案，而且版本管理軟體會加入檔案的新版本，以便其他開發者簽出。

提示：
當您編輯完檔案之後一定要記住簽入它們。如果您長時間簽出它們，您可能會妨礙其他開發者處理它們，並且，在您的網路備份過程中，您會影響備份最新版本的檔案。



如何簽入檔案

1.在[專案管理員]中，選取要處理的檔案。

2.從[專案]功能表中選取[版本管理]，然後選取[簽入]命令。

3.輸入一個說明，以表示您所作的變更。

4.在[簽入檔案]對話方塊中，選取您想處理的檔案，然後按一下 [確定]按鈕。

有關簽入檔案的詳細內容，請參閱「處理多檔案元件」。



相關資訊

如何：簽出檔案

如何：放棄變更

團隊開發專案計畫

在版本管理專案中管理檔案




----------------------------------------------------------------------------------------------
原文：


How to: Check In Files


You must always check in files manually. Visual FoxPro doesn't automatically check in a file; for example, it doesn't check in a form when you close the Form Designer. Instead, it leaves the file checked out so you can continue to edit it, take it offsite, or work with it in some other fashion.

The exact result of the check-in process depends on the file you're checking in and on your source control software. For forms, menus, labels, class libraries, and other types of files, the file is treated as a binary file, and the source control software makes your new version of the file into the current one for other developers to check out.

Tip:
Always remember to check in files when you're done editing them. If you keep them checked out for long periods, you might prevent other developers from working with them, and you'll prevent the latest version of the file from being backed up during the course of your network backup.



To check in a file

1.In the Project Manager, select the file to work with.

2.From the Project menu, choose Source Control, and then choose Check In.

3.Enter a comment describing the changes you've made.

4.In the Check In Files Dialog Box, select the file, and then click OK.

For more information about checking in files, see Working with Multi-File Components.



See Also

How to: Check Out Files

How to: Discard Changes

Planning for Team Development Projects

Managing Files in a Source-Controlled Project

[朱育興]

如何：放棄變更


如果您已經簽出了一個檔案，但是決定放棄您所作的任何變更，您可以撤銷簽出。這樣做具有簽入檔案的效果 (也就是說，其他使用者可以簽出檔案)，但並不會進行更新。例如，如果您錯誤地簽出了一個檔案，本來是想僅僅得到最新版本，這時需要撤銷簽出，而不是簽入檔案。 這樣可以防止版本管理系統建立檔案的另一個版本，還節省了時間和空間。

提示：
如果您想檢視一個檔案，但是不想簽出它，您可以以其它方式得到該檔案的最新版本。



如何撤銷簽出

1.在[專案管理員]視窗中，選取要處理的檔案。

2.從[專案]功能表中，選取[版本管理]，然後選取[取消簽出]命令。

3.在[取消檔案簽出]對話方塊中，確保選取了需要的檔案，然後按一下[確定]命令。



相關資訊

如何：簽入檔案

如何：取得檔案的最新版本

團隊開發專案計畫

在版本管理專案中管理檔案




----------------------------------------------------------------------------------------------
原文：


How to: Discard Changes


If you've checked out a file, but decide to discard any changes you've made, you can undo the checkout. This has the effect of checking the file back in (that is, other users can then check the file out), but doesn't update it with changes. For example, if you mistakenly checked out a file instead of simply getting the latest version, undo the checkout instead of checking the file back in. This prevents the source code control system from having to create another version of the file, thus saving time and space.

Tip:
If you want to view a file but don't need to check it out, you can get the latest version of it.



To undo a checkout

1.In the Project Manager Window, select the file to work with.

2.From the Project menu, choose Source Control, and then choose Undo Check Out.

3.In the Undo Check Out of Files Dialog Box, make sure the file you want is selected, and then click OK.



See Also

How to: Check In Files

How to: Get the Latest Versions of Files

Planning for Team Development Projects

Managing Files in a Source-Controlled Project

[朱育興]

如何：取得檔案的最新版本


如果您想檢視一個檔案的最新版本，您可以簽出它。但是，如果檔案已經簽出了，或者您只想檢視檔案（而不修改它），您可以得到一個檔案的最新版本。當您這樣做時，Visual FoxPro 將檔案最近簽入的版本複製到您的電腦上，但它是唯讀的。即使一個檔案目前已簽出，您仍可以得到它的最新版本。

如果您要得到某文字檔的最新版本，版本管理軟體會將網路上的最新版本與您的版本合併，而不僅僅只是覆蓋它。

注意：
為了在得到最新版本時合併檔案，您也許需要在版本管理軟體中設定相對的選項。有關的詳細內容，請參閱相關的版本管理軟體的文件。



如何取得檔案的最新版本

1.在[專案管理員] 視窗中，選取想要得到最新版本的檔案。

2.從[專案]功能表中，選取[版本管理]，然後選取[獲取最近的版本]命令。如果檔案目前已簽出了，就會提醒您用版本管理專案中目前的版本取代或合併您簽出的版本。

注意：
如果您已經簽出了檔案，Visual FoxPro 會提醒您覆蓋它。如果您在上次簽出檔案之後已經對它作了變更，當 Visual FoxPro 提醒是否取代該檔案時請選取[否]。



相關資訊

如何：放棄變更

如何：比較檔案或專案

團隊開發專案計畫

在版本管理專案中管理檔案




----------------------------------------------------------------------------------------------
原文：


How to: Get the Latest Versions of Files


If you want to view the latest version of a file, you can check it out. However, if the file is already checked out, or if you only want to view the file (not modify it), you can get the latest version of a file. When you do, Visual FoxPro copies the most current checked-in version of a file to your computer, but leaves it as a read-only file. You can get the latest version of a file even if it's currently checked out.

If the file you're getting is a text file, the source control software will merge the most current one with your vesrsion instead of simply overwriting it.

Note:
To merge files when getting the latest version, you might need to enable this as an option in your source control software. For details, see the documentation for your source control software.



To get the latest version of a file

1.In the Project Manager Window, select the file for which you want the latest version.

2.From the Project menu, choose Source Control, and then choose Get Latest Version. If the file is currently checked out, you're prompted to replace or merge your checked-out version with the current version from the source control project.

Note:
If you already have the file checked out, Visual FoxPro prompts you to overwrite it. If you've made changes to the file since last checking it out, choose No when prompted to replace the file.



See Also

How to: Discard Changes

How to: Compare Files or Projects

Planning for Team Development Projects

Managing Files in a Source-Controlled Project

[朱育興]

如何：比較檔案或專案


當您處理檔案和專案時，您可能想將您工作目錄中目前的本地電腦備份與版本管理專案中的主程式進行比較。這樣可以說明是否另一個使用者變更了檔案，且它可以幫助您明確找到您簽出檔案之後該檔案是否有作過變更。

大多數版本管理系統只能比較和顯示文字格式檔之間的不同。當 Visual FoxPro 比較表單、報表、功能表、標籤和類別定義函數庫時，它使用這些檔案的文字來表示。

注意：
如果您的版本管理系統不支援檔案比較選項，則在功能表上就沒有相對的命令可用。



如何比較專案之間的區別

•從[專案]功能表中，選取[版本管理]，然後選取[顯示專案清單的差異]命令。

不同的版本管理軟體可能會產生不同的的結果。但是，通常版本管理系統會顯示擁有兩個窗格的視窗，並且會突顯或標示檔案中本地電腦備份和主程式之間的不同。



如何顯示檔案或專案清單之間的區別

1.如果您要檢視單一檔案的差異，請您在[專案管理員]中，選取想要檢視區別的檔案。

2.對於單一檔案，請從[專案]功能表中，選取[版本管理]，然後選取[顯示差異]命令。對於專案清單，請從[專案]功能表中，選取[版本管理]，然後選取[顯示專案清單的差異]命令。

不同的版本管理軟體可能會產生不同的的結果。但是，通常版本管理系統會並排顯示兩個版本，並且會突顯或標示新的、移除和變更的行。



相關資訊

如何：取得檔案的最新版本

如何：驗證表單、報表和其他資料表格檔案的區別

團隊開發專案計畫

在版本管理專案中管理檔案




----------------------------------------------------------------------------------------------
原文：


How to: Compare Files or Projects


When working with files and with a project, you might need to compare the current local copy in your working directory with the current master copy in the source-controlled project. This can help you determine whether another user has changed a file, or it can help you pinpoint where you've made changes since you checked out the file.

Most source control systems can only compare and display differences between files if they're in text format. When Visual FoxPro compares forms, reports, menus, labels, and class libraries, it uses the text representations of those files.

Note:
If your source control provider doesn't support file comparison options, they aren't available on the menu.



To see differences between projects

•From the Project menu, choose Source Control, and then choose Show Project Differences.

The resulting report is produced by your source control software, so the specific information provided can vary. In general, however, the source control system will display a window with two panes, and will highlight or otherwise mark the differences between the local and master copies of the file.



To see differences between files or the project list

1.If you're viewing differences for a single file, in the Project Manager, select the file for which you want to see differences.

2.For a single file, from the Project menu, choose Source Control, and then choose Show Differences. For the project list, from the Project menu, choose Source Control, and then choose Show Project List Differences.

The resulting report is produced by your source control software, so the specific information provided can vary. In general, however, the source control system will display the two versions side-by-side, and will highlight or otherwise mark new, deleted, and changed lines.



See Also

How to: Get the Latest Versions of Files

How to: Check for Differences in Forms, Reports, and Other Table Files

Planning for Team Development Projects

Managing Files in a Source-Controlled Project

[朱育興]

如何：驗證表單、報表和其他資料表格檔案的區別


在 Visual FoxPro 中，版本管理軟體只將幾種型態的檔案看作文字檔。其中包括程式原始程式碼 (.prg) 檔案和專案清單 (.pjm 檔案)。表單、報表和其他型態的檔案系統將它們的訊息以資料表格的型式儲存。例如，表單的 .scx 檔案是儲存表單中控制項的資料表格，再加上表單本身的訊息。用資料表格儲存訊息的檔案有︰表單 (.scx 檔案)、報表 (.frx 檔案)、功能表 (.mnx 檔案)、標籤 (.lbx 檔案) 和類別定義函數庫 (.vcx 檔案)。

因為這些檔案儲存為 Visual FoxPro 的資料表格，版本管理系統無法將它們看作文字檔 (版本管理系統將它們看作“二進位”檔案)。結果，檢視這些檔案版本之間區別的工具就無法明確指出它們之間的區別，您也無法看到變更的歷程記錄。

為了允許您使用版本管理檢視表單、報表和類似檔案之間的區別，Visual FoxPro 建立了它們的文字說明。當您將一個這樣的檔案置於版本管理之下時，Visual FoxPro 就會自動建立該檔案的文字版本，當您作變更時，它便會自動加以維護。



Visual FoxPro 有一個工具程式 Scctext.prg，它可以把資料表格型態的檔案轉換成它們相對的文字說明，別的廠家也提供類似工具，您甚至可以自己開發一個。



如何指定一個文字轉換工具

1.在[選項]對話方塊中選取[專案]檔案。

2.在[文字產生]方塊中，鍵入轉換程式的名稱。

3.選取[設定為預設值]，然後選取[確定]。



無論何時您在版本管理專案中加入表單、報表、功能表、標籤或視覺化類別檔案時，Visual FoxPro 都自動呼叫文字轉換程式。這個工具產生一個文字檔，檔案名稱與主程式相同，但是用 “A” 作為副檔名的最後一個字母。例如，對於一個名為 Myform.scx 的表單，該工具產生一個名為 Myform.sca 的文字檔。當您變更完表單並簽入它時，版本管理軟體自動建立並簽入文字檔。

當版本管理專案中有既存的表單、報表和類似檔案時，如果您想要指定文字轉換工具，必須暫時將它們從專案中移除，當文字產生選項啟用了之後，再重新將它們新增到專案中。


如何為專案中既存的檔案產生文字說明

1.備份所有會影響到的檔案︰表單、報表、功能表、標籤和類別定義函數庫。

2.確認檔案沒有被簽出。

3.從[專案]功能表中選取[版本管理]，然後選取[從版本管理中刪除檔案]命令。

4.選取要從專案中移除的檔案，然後選取[確定]。

5.按照前面講述的步驟啟用文字產生。

6.從[專案]功能表中，選取[版本管理]，然後選取[將檔案加至版本管理中]命令。

7.選取要加入的檔案，然後選取[確定]。

當把每個檔案置於版本管理之下時，Visual FoxPro 同樣建立每個檔案的對應的文字說明。



相關資訊

如何：比較檔案或專案

如何：顯示檔案和專案資訊

團隊開發專案計畫

在版本管理專案中管理檔案




----------------------------------------------------------------------------------------------
原文：


How to: Check for Differences in Forms, Reports, and Other Table Files


In Visual FoxPro, only a few types of files are treated as text files by the source control software. These include program source code (.prg) files and the project file list (.pjm file). Forms, reports, and other types of files are actually stored as tables of information about their components. For example, a form's .scx file is a table of the controls in that form, plus information about the form itself. Table-type files are used to store information about forms (.scx files), reports (.frx files), menus (.mnx files), labels (.lbx files), and class libraries (.vcx files).

Because these files are stored as Visual FoxPro tables, source control systems cannot treat them as text files (the source control system treats them as "binary" files). As a result, tools for viewing differences between versions of these files cannot pinpoint the differences, nor can you see a history of changes.

In order to allow you to use source control to view differences in forms, reports, and similar files, Visual FoxPro creates text representations of them. Then, when you put one of these files under source control, Visual FoxPro creates a text version of the file, which it maintains automatically as you make changes.



To support the capability to generate text representations of table-type files, Visual FoxPro includes the utility program Scctext.prg, or you can use a different program that you obtain from another source or write yourself.



To specify a text conversion utility

1.In the Options dialog box, choose the Projects file.

2.In the Text generation box, enter the name of the conversion program.

3.Choose Set as Default, and then choose OK



Visual FoxPro automatically calls the text conversion program whenever you add a form, report, menu, label, or visual class file to a source-controlled project. The utility generates a text file that has the same name as the primary file, but uses "A" as the last letter of the extension. For example, for a form called Myform.scx, the utility generates a text file called Myform.sca. When you check in the form (or other file) after changing it, the source control software automatically creates and checks in the text file.

If you specify a text conversion utility when you already have forms, reports, and similar files in your source-controlled project, you must temporarily remove them from the project, and then re-add them with text generation enabled.


To generate text representations for existing files in a project

1.Back up all the files that will be affected: forms, reports, menus, labels, and class libraries.

2.Verify that the files aren't already checked out.

3.From the Project menu, choose Source Control, and then choose Remove Files from Source Control.

4.Select the files to remove from the project, and then choose OK.

5.Enable text generation, following the steps described earlier.

6.From the Project menu, chooseSource Control, and then choose Add Files to Source Control.

7.Select the files to add, and then choose OK.

As it puts the each file under source control, Visual FoxPro also creates the corresponding text representation for the file.



See Also

How to: Compare Files or Projects

How to: Display File and Project Information

Planning for Team Development Projects

Managing Files in a Source-Controlled Project