> > 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.
>
Maybe, but in this case the feature will die...
Only the changes in one revision I want to move back to the main trunk.
In fact I can do it manually too, but I want to know what's happening here.
> >
> > 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.
>
I don't think so.
First I tried it with TortoiseSVN -> there I selected the revision
Afterwards I tried it also with the commandline client and
a parameter like -r 277:278 should do the trick, isn't it?
It tried also the option ignore-ancestry (commandline and tortoise),
but in both cases subversion starts with earlier versions.
> BOb
Received on 2010-04-23 09:37:48 CEST