On 04/08/17 11:54 , Charlie Fenton wrote: > Perhaps I'm not understanding what you meant by "contains", but if I > create a new branch named "newbranch" from an existing branch named > "oldbranch", then any commits made to oldbranch after that are not > included in a build I make using newbranch unless I specifically port > them over, such as by cherry picking them from oldbranch into > newbranch or by merging one branch into the other.
That's correct. > As I > understand it, checking out a branch or tag simply "hides" from your > development tools anything that is not considered part of that branch > or tag, while "revealing" to your developer tools everything that is > considered part of the branch or tag. Correct. > This allows us to perform a build at any time from exactly the same > source files as were originally used to build the version represented > by the tag. And it allows us to build from a feature branch without > including subsequent changes made outside that branch, which can be > useful while developing a feature. Correct. > Since the client_release/7/7.8 branch was created from master and was > then immediately tagged as client_release/7/7.8.0, Richard is correct > that, as a result of the way the branch was created, all the Drupal > source code up to that time became available in the branch and under > that tag, along with everything else in master at that point. I > believe that is what he meant by "included". Yep, I just wanted to make sure that this part is clear. It could also have meant that he wondered why the Drupal stuff is included in a client branch/tag *at all*, as in SVN times one could have created a branch/tag by only copying the client-related parts of trunk. Hence my words "potential confusion". Best, Oliver
smime.p7s
Description: S/MIME Cryptographic Signature
_______________________________________________ boinc_dev mailing list boinc_dev@ssl.berkeley.edu https://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
