[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: Bicking, David (HHoldings, IT) <David.Bicking_at_thehartford.com>
Date: 2007-09-11 21:02:41 CEST


> -----Original Message-----
> From: Andy Levy [mailto:andy.levy@gmail.com]
> On 9/11/07, Bicking, David (HHoldings, IT)
> <David.Bicking@thehartford.com> wrote:
> >
> > > -----Original Message-----
> > 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.

You're right - I'm a victim of my own lazyness. Sorry 'bout that.
Won't happen again!

> > 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.

This appears to work, thanks. I was confused by what looks to me like
incorrect TortoiseSVN documentation on the merge feature. Maybe I'll go
over there and ask them about that.

This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information. If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited. If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.

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:59:30 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.