[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Merging a Revision back to the trunk

From: Jeremy Mordkoff <jlm_at_ZeeVee.Com>
Date: Thu, 22 Apr 2010 13:45:11 -0400

What command did you use? When was the branch created? At rev 226?

jlm

Jeremy Mordkoff
Director, QA, IT & Release
ZeeVee, Inc.
One Monarch Drive | Littleton, MA 01460
Office: 978.467.1395 x233 | Fax: 978.467.1404
Mobile: 978-257-2183
jlm_at_zeevee.com
www.zeevee.com

> -----Original Message-----
> From: Georg Heisenberger [mailto:heissenberger.georg_at_gmx.at]
> Sent: Thursday, April 22, 2010 1:13 PM
> To: users_at_subversion.apache.org
> Subject: Merging a Revision back to the trunk
>
> Hi everybody!
>
> I$B!G(Jve 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(J The changes made in the specific revision should be
> applied on my working copy (trunk)
>
> The $B!H(Jproblem$B!I(J (at least I don$B!G(Jt understand why it$B!G(Js happening)
> is that subversion is merging more than one revision.
>
> In my case I only want revision 278.
> The response of subversion is, that it starts with revision 226
>
>
> The result: I$B!G(Jve got more things merged to my WC than I wanted to
>
> I would be glad, if some can tell me, why that is happening
>
> Georg
>
Received on 2010-04-22 19:45:41 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.