On Oct 7, 2005, at 18:16, spinn wrote:
> Wait a minute...okay, I've gotten myself confused again.
>
> I'm done with the feature branch. I merge all trunk changes into
> the branch, to prepare for moving the branch back into the trunk
> and deleting it. This means the trunk and branch are identical,
> except for changes on the branch. Got that.
>
> But then the book says to go to a trunk working copy and do a merge
> like the following:
>
> svn merge svn://server/branch_at_HEAD svn://server/trunk_at_HEAD
>
> But this conceptually seems backwards to me? Because branch changes
> are "newer" than the trunk changes at this point; I would think
> that the delta branch->trunk would show that extra files in the
> branch should be disregarded, text that has been added in the
> branch shouldn't be in the trunk, etc. I imagine I'm getting
> confused on the delta direction but I can't figure it out.
>
> Though now, when I do a dry run in either direction, I get a number
> of "skipped missing target"s. One is due to our mistakenly adding
> files to the trunk which existed in the branch; another is because
> I'm apparently choosing the wrong direction. I'm lost on which is
> which, now.
Where does it say to do it that way? You're right, that's backwards.
"svn merge A B C" means "make a set of instructions that convert A
into B, and perform the instructions on C." If you don't specify C,
it means "the working copy I'm in right now." So what you want to do
is take the set of changes that exist between trunk and the branch,
and apply them to a working copy of trunk.
svn merge svn://server/trunk_at_1234 svn://server/branches/branch_at_1234 /
path/to/working/copy/of/trunk
You probably shouldn't specify HEAD there either, and should instead
use the specific revision of trunk that you merged to the branch.
Otherwise somebody else could commit additional work to trunk in the
mean time, and your merge would then have the effect of undoing those
changes, which would be bad.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 7 19:30:46 2005