RE: Labels vs. Branches
"Monte Kalisch" <[email protected]>
| Newsgroups | gmane.comp.version-control.sourcegear-vault.user |
|---|---|
| Message-ID | <E486E6988349414986EBD7C0DACEBC0B5DF423@rushmore.connectionsacademy.org> |
Please please please tell me that when you implemented this labeling feature for 2.0 that it does not increase the version number. -----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Dan Schreiber Sent: Saturday, January 17, 2004 10:51 AM To: Mike Kraley; [email protected] Subject: RE: [vault-list] Labels vs. Branches Originally, the conceptual difference between the two was: Labels are branches you don't intend to modify greatly. Branches are branches that you do intend to modify. So, labels would be used to mark releases, where perhaps you'd have a few bug fixes that come in that you want to address, but branches are more for creating something new or different, but based on an original code base. However, underneath the hood, they are pretty much the same except that labels have a different color icon (clear, because they are considered "virtual folders"), you can hide labels from your tree, and a label will automatically pin itself after the label. However: For 2.0, this distinction is eliminated completely. We've re-implemented labels to be SourceSafe tag-style labels, where a label is a textual tag on a folder or file. We have kept the old 1.0 implementation of labels, but have renamed them "snapshots", because a number of Vault customers really wanted to keep them. So, you could still choose between snapshots and branches, but we would recommend just using branches going forward, since it doesn't really matter whether you intend to to change the code or not, it is functionally the same, and we want to reduce confusion. One other thing to point out: For 2.0, you still may want to branch your trunk at end of a release cycle. You could label of course, but the nice thing about branching is that you can apply bug fixes right there in your tree, and then merge them automatically back into the trunk. -Dan Schreiber -----Original Message----- From: [email protected] [mailto:[email protected]]On Behalf Of Mike Kraley Sent: Wednesday, January 14, 2004 1:18 PM To: [email protected] Subject: [vault-list] Labels vs. Branches I'm trying to get the Vault model into my head, so we can evaluate how best to use its features in our environment. In particular, I'm stuck on the differences between Labels and Branches. One of your white papers says "An important thing to realize here is that in every way that matters, a Label and a Branch are the same thing." OK. So what is the difference? When would I use one vs, the other? ...Mike