Search found 11 matches
- Thu Jul 24, 2008 8:01 am
- Forum: Support (Vault)
- Topic: Merging long-running feature branches
- Replies: 9
- Views: 5168
Thanks Beth, We do not release from our feature_branches, we merely use them as a way to isolate long running feature development from our trunk. Because the feature branch has the potential to live a long time because of new development, we do not want to let it grow independently of the changes ma...
- Thu Jul 24, 2008 7:45 am
- Forum: Support (Vault)
- Topic: Merging long-running feature branches
- Replies: 9
- Views: 5168
Jeff, Thanks for the explanation of how DiffMerge works with branched files during a merge. I will have a look at DiffMerge's Folder window to compare the two folders when we work with large merges like this in addition to the merge tool. I think Greg's question is what I was trying to get at. Would...
- Wed Jul 23, 2008 11:34 am
- Forum: Support (Vault)
- Topic: Merging long-running feature branches
- Replies: 9
- Views: 5168
Here are some images and explanations for clarification: The file referenced here was changed in the trunk. It got pushed into the feature branch during a trunk->feature branch merge. This file was NOT changed in any other way in the feature branch. Therefore, after the merge, the file is exactly th...
- Wed Jul 23, 2008 9:09 am
- Forum: Support (Vault)
- Topic: Merging long-running feature branches
- Replies: 9
- Views: 5168
Merging long-running feature branches
Here is the background for my problem: We have a stable development trunk. We created a feature branch to work on a seperate component. During the lifetime of the branch, there have been many revisions to the trunk. We are finished with the development of our feature and want to push the changes bac...
- Thu Oct 18, 2007 7:12 am
- Forum: Support (Fortress)
- Topic: Error 1722 during Fortress Installation
- Replies: 14
- Views: 16615
I wanted to follow up with the current status of my issue. I attempted to uninstall and reinstall Visual Studio and the .NET framework 2.0 to see if this would solve this issue, but this caused a boatload of problems for my system. After doing some further research, it appears that my hard drive had...
- Tue Oct 16, 2007 9:17 am
- Forum: Support (Fortress)
- Topic: Error 1722 during Fortress Installation
- Replies: 14
- Views: 16615
We use both clients right now because we have 2 source repositories and we haven't upgraded the other server yet (hopefully someday). But for the time being we still need to access the other Vault repository while having access to the Fortress repository on our other server... That issue aside, I tr...
- Tue Oct 16, 2007 8:25 am
- Forum: Support (Fortress)
- Topic: Error 1722 during Fortress Installation
- Replies: 14
- Views: 16615
- Tue Oct 16, 2007 7:57 am
- Forum: Support (Fortress)
- Topic: Error 1722 during Fortress Installation
- Replies: 14
- Views: 16615
Here's some more information that may be useful. I ran the installation and left the error box up so I could use the client and got the latest source code from the repository using the Fortress GUI Client. I then closed out the installer by clicking OK, which rolled back my install. When I opened vi...
- Mon Oct 15, 2007 8:52 am
- Forum: Support (Fortress)
- Topic: Error 1722 during Fortress Installation
- Replies: 14
- Views: 16615
Here's something else I just noticed: In my Application Event Viewer log, I see these two Errors: Source: .NET Runtime 2.0 Error Reporting Faulting application vsipclientcustomactions.exe, version 1.0.4.15848, stamp 46b74316, faulting module gdiplus.dll, version 5.1.3102.2180, stamp 4110968b, debug?...
- Mon Oct 15, 2007 8:46 am
- Forum: Support (Fortress)
- Topic: Error 1722 during Fortress Installation
- Replies: 14
- Views: 16615
Windows XP Pro SP 2 Actually I can launch the Fortress Client without error (while the error dialog is up). The problem is, after the error, it rolls back the installation so I lose the file structure and all of the assemblies. They exist while the error message is displayed, but it rolls back after...
- Mon Oct 15, 2007 7:30 am
- Forum: Support (Fortress)
- Topic: Error 1722 during Fortress Installation
- Replies: 14
- Views: 16615
Error 1722 during Fortress Installation
During the installation of the Fortress client I get the following error: "Error 1722. There is a problem with this Windows Installer package. A program run as part of the setup did not finish as expected. Contact your support personnel or package vendor." The installer windows says "...