RE: Merging a Revision back to the trunk

> Hi everybody!
>
> I$B!G(Bve got a question about merging a revision of an
> feature- branch back to the trunk.
> Sounds quiet simple:
> - Select the branch
> - The revision
>
> $B"M(B The changes made in the specific revision should be
> applied on my working copy (trunk)

That's not really the use case of a feature branch. But it should work.

>
> The $B!H(Bproblem$B!I(B (at least I don$B!G(Bt understand why it$B!G(Bs happening)
> is that subversion is merging more than one revision.

Well, did you specify the single revision? Also, you will probably want to do a --record-only merge from trunk to branch of the merge's commit rev if you will want to later --reintegrate the feature branch to trunk.

> In my case I only want revision 278.
> The response of subversion is, that it starts with revision 226
>
>
> The result: I$B!G(Bve got more things merged to my WC than I wanted to
>
> I would be glad, if some can tell me, why that is happening

I'm pretty sure cause you are not specifying a rev number with -r or -c.

BOb
Received on 2010-04-22 20:08:27 CEST