Link trunking in Xcode 4

Question

The new Xcode 4 brought many useful (still buggy, but useful) additions, especially in the SCM department. One of them is the ability of branches. I have a project that has the following structure: / trunk / Branches / branch1 / Branches / branch2

I want to combine the current updates made in trunk on a branch, so merging them in the future will not be too painful. I know the necessary steps to do this on the command line, but I find it too cumbersome and would rather do it with Xcode. I have a trial version of Cornerstone, and using the "Sync branch" option, it quickly captures all the latest updates in the trunk and applies them to my branch. On Xcode 4, the merge function allows me to merge FROM branches, not from the trunk! Msgstr "Select the branch to merge into the current branch." When in fact, what I need from the branch includes changes made on the trunk. I can do this in the opposite direction by merging the branch on a new working copy of the trunk, but then the changes are radically big, and it takes a lot of time.

Is there any option? I was thinking that maybe my trunk is actually a branch, I don’t even know if this will work, but this is not the best solution.

Thanks to everyone.

Answer 1

Use Xcode Organizer for the following steps:

• Commit any trunk changes
• Add a temporary trunk with a trunk as a starting point (for example, "TempBranch")
• Select your working copy and “Disconnect branch” to the branch you want to update with changes to the trunk.

Use the Xcode File menu to continue:

• File> Source Control> Merge ... and select TempBranch
• Fix any conflicts.

Your branch should now contain trunk changes. You can also remove TempBranch.

Answer 2

Xcode 4 does not support trunk merging on a branch. This was confirmed by an Apple employee in the following section on the Apple developer forums:

Subversion branch synchronization