Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
Given the following scenario
Start off with this structure:
Trunk\blah\
Tag\
I branch Trunk into Tag. Now I have
Trunk\blah\
Tag\Version 1\blah\
I branch my newly created tag again. Now I have:
Trunk\blah\
Tag\Version 1\blah\
Tag\Version 2\blah\
I make a change to blah in Version 2 and commit. Can I merge that change back into Trunk\blah directly? IE can I skip the chain of branches and keep Version 1 as it was when tagged.
Yes. In Subversion you can even merge completely unrelated paths.
BTW, the common convention is to use a /tags directory for tags – branches which are never modified. Branches which are kept for making fixes on are usually placed in a /branches directory.