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

Re: Re: Unable to cause a conflict in branch merge test

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-09-11 20:22:31 CEST

On 9/11/07, Bicking, David (HHoldings, IT)
<David.Bicking@thehartford.com> wrote:
> > -----Original Message-----
> > From: Kris Deugau [mailto:kdeugau@vianet.ca]
> > Sent: Tuesday, September 11, 2007 12:48 PM
> >
> > Bicking, David (HHoldings, IT) wrote:
> > > I am having a problem with what I thought was a very simple
> > test. I
> > > am attempting to merge a specific file in a branch into the trunk,
> > > which also has that file. I changed both files such that
> > at one place
> > > there should be conflicting changes, and at another there are
> > > non-conflicting changes. I simply modified some text which
> > ended up similar to :
> -- snip --
> > I can't read your Word document (if you *must* create
> > screenshots, please post them to public webspace somewhere as
> > .jpg or .png images), but from the description you're
> > tripping over the details of exactly how a merge works.
> Yeah, well, I'm only allowed to use the software already installed on
> this computer. I put it into Paint and got a 1.5M BMP file. I decided
> Word was a better option at 29.5K. Don't you have Open Office? :P

How old is your copy of Paint? In XP, I have the option to save as
GIF, JPG, TIFF or PNG in addition to BMP.

> I don't see how to do this either from the online help or the book. If I
> understand correctly, you are saying I want to merge a range of changes
> from the branch into trunk, via the workspace. In this case r47 through
> r53 on the branch into the head of the trunk. If this is correct, now
> do I specify the range? I see one revision number entry per branch.
> If I read the instructions differently, it appears that I would locate
> my client in the workspace of my trunk, then specify the range on the
> branch, like this:
> Cd /myworkspace
> Svn merge -r 47:53 /MyRepos/MyProj/Branches/MyBranch
> Would this then merge revisions between 47 and 53 into my workspace
> copy, which is the updated trunk?

Yes. It will in essence produce a diff of MyBranch for that revision
range, then apply that diff to the current directory - which should be
a WC of your trunk.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Sep 11 20:19:21 2007

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.