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

Re: Merge question

From: CoolBreeze <coolbreeze812_at_googlemail.com>
Date: Fri, 5 Mar 2010 13:02:13 -0500

Ok after having a few more discussions here's a situation that we face
frequently.

Lets say Bob is working on Trunk\ProjectX\File1 and John is working on
Trunk\ProjectX\File3 and Trunk\ProjectX\File7. Now Bob needs to leave early
for the day, but his code is not complete, regardless he comits his code, so
that it's safe within the repository and gets revision 21. Now John at the
end of the day comits his code and gets revision 22.

How can a partial merge be done using TortoiseSVN to get John's code, but
exclude Bob's due to it not being complete yet? Performing an update would
get you revision 22, which in turn would include Bob's code from revision
21.

I was looking over the merge options within Tortoise, but I was unable to
easily indentify a way of handling this type of situation, if it's even
possible to do so.

Thanks.

On Fri, Mar 5, 2010 at 10:22 AM, Tyler <tyler_at_cryptio.net> wrote:

> I am not the list.
>
> On Fri, Mar 05, 2010 at 08:45:59AM -0500, CoolBreeze wrote:
> > Ok after having a few more discussions here's a situation that we face
> > frequently.
> >
> > Lets say Bob is working on Trunk\ProjectX\File1 and John is working on
> > Trunk\ProjectX\File3 and Trunk\ProjectX\File7. Now Bob needs to leave
> early
> > for the day, but his code is not complete, regardless he comits his code,
> so
> > that it's safe within the repository and gets revision 21. Now John at
> the
> > end of the day comits his code and gets revision 22.
> >
> > How can a partial merge be done using TortoiseSVN to get John's code, but
> > exclude Bob's due to it not being complete yet? Performing an update
> would
> > get you revision 22, which in turn would include Bob's code from revision
> > 21.
> >
> > I was looking over the merge options within Tortoise, but I was unable to
> > easily indentify a way of handling this type of situation, if it's even
> > possible to do so.
> >
> > Thanks.
> >
> > On Thu, Mar 4, 2010 at 4:04 PM, Tyler <tyler_at_cryptio.net> wrote:
> >
> > > Try this query again on the list. You'll need to add more detail (what
> > > did you try? what is the output?) if you want a good answer.
> > >
> > > tyler
> > >
> > > On Thu, Mar 04, 2010 at 02:38:48PM -0500, CoolBreeze wrote:
> > > > Thanks I had a look already, but I'm just just not understanding
> clearly
> > > how
> > > > to handle deal with it. I was looking for something more
> straightforward
> > > on
> > > > this particular situatin.
> > > >
> > > >
> > > > On Thu, Mar 4, 2010 at 2:33 PM, Tyler Roscoe <tyler_at_cryptio.net>
> wrote:
> > > >
> > > > > On Thu, Mar 04, 2010 at 02:29:33PM -0500, CoolBreeze wrote:
> > > > > > Now having all production source code witin the Trunk and
> development
> > > > > within
> > > > > > the Branches, if I'm working on the source of a particular
> > > sub-program
> > > > > > within the Branches as well as another developer is working a
> > > different
> > > > > > source file also under the same Branch, I've completed my work
> and am
> > > > > ready
> > > > > > for my changes to be merged back into the Trunk. Is it possible
> to
> > > merge
> > > > >
> > > > > This is a cherry-pick merge. Check out the Merge chapter of the
> book
> > > (or
> > > > > wait for someone less lazy than me to link you to it).
> > > > >
> > > > > tyler
> > > > >
> > >
>
Received on 2010-03-05 19:02:48 CET

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