SVN help with the new branch

Discussion among members of the development team.

Moderator: Forum Moderators

Post Reply
scott
Posts: 5243
Joined: May 12th, 2004, 12:35 am
Location: San Pedro, CA

SVN help with the new branch

Post by scott »

1. With or without a 1.2 branch checkout, can I do a trunk commit and have it be applied to the 1.2 branch also?

if not,

2. Without a 1.2 branch checkout, can I do a 1.2 branch commit using my trunk working copy?
Hope springs eternal.
Wesnoth acronym guide.
User avatar
zookeeper
WML Wizard
Posts: 9742
Joined: September 11th, 2004, 10:40 pm
Location: Finland

Post by zookeeper »

I think the "switch" command is how you, uh, do it. Like, if you have a trunk checkout, you can use switch to switch it to be a 1.2 checkout. At least that's what I did, and it worked.
Yogibear
Retired Developer
Posts: 1086
Joined: September 16th, 2005, 5:44 am
Location: Hamburg, Germany

Post by Yogibear »

Yes, "switch" makes your working copy use another branch. However, there is no way to automatically apply a change to both branches at the same time.

You will either have to have two checkouts and apply the change to both of them or you have one checkout, apply the change, switch to the other, then apply again.
Smart persons learn out of their mistakes, wise persons learn out of others mistakes!
scott
Posts: 5243
Joined: May 12th, 2004, 12:35 am
Location: San Pedro, CA

Post by scott »

It looks like isaac has been take care of merging 1.3 changes into 1.2. Thanks! I will try to take care of it myself from now on.
Hope springs eternal.
Wesnoth acronym guide.
Post Reply