1) Are there plans to allow you to edit the text while fixing a merge conflict like VSS does.
2) Branching and Sharing in VSS used to conflict. If you had 2 files shared and you branched them together you broke the share. This always got us in trouble. But Sharing is so powerful.
3) Will Bug Tracking integration eventually (if not already) be standardized? We use Team Track which is a really good tool.
Questions
Moderator: SourceGear
Re: Questions
Yes, but it won't be available it the next release - look for it after that.George Mills wrote:1) Are there plans to allow you to edit the text while fixing a merge conflict like VSS does.
Not sure what the question is2) Branching and Sharing in VSS used to conflict. If you had 2 files shared and you branched them together you broke the share. This always got us in trouble. But Sharing is so powerful.
, but we do work like VSS - branching a share is how you break the share. If you want a shared item to be shared in another place, you would invoke Share again. Do note that Vault allows sharing (and pinning) of folders as well as files, which provides added functionality over VSS.We plan to release our own bug tracking with the 2.1 release of Vault. However, we still don't support integration with Team Track.
3) Will Bug Tracking integration eventually (if not already) be standardized? We use Team Track which is a really good tool.
-
George Mills
- Posts: 33
- Joined: Tue Aug 24, 2004 8:19 am
Thanks for the quick responses. That's a huge plus when trying to convince my boss to not use cvs.
On the share thing.
Lets say I have
ProjMaster->ProjA->ClassAFile
ProjMaster->ProjB->ClassAFile (shared with the ClassAFile)
Now I Share and BrancH ProjMaster->ProjMaster_V2
In VSS ClassAFile is no longer shared between ProjA and ProjB in the ProjMaster_V2 branch. This causes major problems for us. We use sharing of files with no intent to branch them. We just want to share them forever. But we still have to branch projects that hold these shared files and want to retain that relationship.
On the share thing.
Lets say I have
ProjMaster->ProjA->ClassAFile
ProjMaster->ProjB->ClassAFile (shared with the ClassAFile)
Now I Share and BrancH ProjMaster->ProjMaster_V2
In VSS ClassAFile is no longer shared between ProjA and ProjB in the ProjMaster_V2 branch. This causes major problems for us. We use sharing of files with no intent to branch them. We just want to share them forever. But we still have to branch projects that hold these shared files and want to retain that relationship.
In vault, shares within the tree you branched are retained, and shares outside of it are broken.
In your example:
ProjMaster->ProjA->ClassAFile
ProjMaster->ProjB->ClassAFile
would be shared with each other and
ProjMaster_V2->ProjA->ClassAFile
ProjMaster_V2->ProjB->ClassAFile
would be shared together, but all 4 files would not be shared with each other - there are now 2 distinct sets.
We did this precisely so that folders could be branched, and changes to shared files within the branch are ok, but are not copied to shares outside the branch, which makes sense if you are continuing development in version 2, and don't want potentially destabilizing changes to be automatically applied to your earlier version.
In your example:
ProjMaster->ProjA->ClassAFile
ProjMaster->ProjB->ClassAFile
would be shared with each other and
ProjMaster_V2->ProjA->ClassAFile
ProjMaster_V2->ProjB->ClassAFile
would be shared together, but all 4 files would not be shared with each other - there are now 2 distinct sets.
We did this precisely so that folders could be branched, and changes to shared files within the branch are ok, but are not copied to shares outside the branch, which makes sense if you are continuing development in version 2, and don't want potentially destabilizing changes to be automatically applied to your earlier version.