On Oct 7, 2005, at 10:35 AM, spinn wrote:
> On Oct 4, 2005, at 12:08 AM, Steve Williams wrote:
>
>
>> spinn wrote:
>>
>>
>>> But, everything I've seen involving "skipped missing target" is
>>> generally answered by saying "the user screwed up somewhere", but
>>> I feel like I'm following the directions provided. Anyone have a
>>> hint what I'm doing wrong, or if this is too vague, can tell me
>>> the best way to provide information that more clearly will
>>> illustrate my problem? (I'm using TortoiseSVN, if it matters,
>>> though I'm familiar enough with command line svn if outputs are
>>> required.)
>>>
>>>
>>
>> Do the merge back to trunk as shown at the end of this page.
>> http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.1
>>
>>
>
> Figured it out. For the benefit of the archive, thought I'd send my
> mistake: for the final merge I was comparing changes from the
> branch to the trunk, then merging that into the trunk . Obviously,
> I should've been comparing changes from the trunk to the branch.
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 7 18:18:48 2005