Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Branch Control Issue

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Hide all messages in topic

All messages in topic

Re: Branch Control Issue

Author joedayney
Full name Joe Dayney
Date 2009-01-07 13:38:56 PST
Message Creating the branch is easy ... where we have had fun is when we want to
merge the branch back to the trunk ... then life gets more interesting !


Best Regards,
 
Joe
 
____________________​____________________​____________________​____________________​________

Joseph H. Dayney | Software Engineer | RR Donnelley
630W 1000N | Logan, UT 84321 | (: 435-755-4278 | 801-453-5015 |È:
435-770-7244 | Ê: 435-755-4210 | *: joseph dot h dot dayney at rrd dot com
 
This email and any files transmitted with it are confidential and intended
solely for the use of the individual or entity to whom they are addressed.
Any unauthorized review, use, disclosure or distribution is prohibited. If
you are not the intended recipient, please contact the sender by reply
e-mail and destroy all copies of the original message.
 



digitalpacman <digitalpacman@ho​tmail.com>
01/07/2009 10:44 AM
Please respond to
users <users@tortoisesv​n.tigris.org>


To
users at tortoisesvn dot tigris dot org
cc

Subject
Re: Branch Control Issue






Yeah Sorry they are at the same root as the trunk, I worded that
incorrectly.


/trunk
/branches

On Jan 7, 9:40 am, Bob Archer <Bob.Arc...@amsi.com> wrote:
> First, I assume you don't put your branches folder IN your trunk folder.
> It should be at the same level as your trunk folder.
>
> Personally, I prefer to tell it to NOT switch to the branch I make and I
> checkout the branch to a separate WC. This makes it much easier to know
> what branch I am working it.
>
> I also make my branches using the repo browser rather than the working
> copy.
>
> I do know that the subclipes client is supposed to have some visual
> branching views and graphs. But, I have never used it.
>
> BOb
>
>
>
>
>
> > -----Original Message-----
> > From: digitalpacman [mailto:digitalpac..​.@hotmail.com]
> > Sent: Wednesday, January 07, 2009 12:33 PM
> > To: us...@tortoisesvn.tigris.org
> > Subject: Branch Control Issue
>
> > Hello,
>
> > I was wondering if anyone else is having a "fun time" using the branch
> > control in TortoiseSVN?
> > My company has expanded to the point where we feel we should start
> > taking advantage of branches, but it seems like an ordeal, with many
> > places for error, using TortoiseSVN.
>
> > Are we missing something? Anyone know of a client that has good branch
> > support?
>
> > Ideally, we would want a client that would manage our branches for us,
> > so we don't have to remember/type in the folders everytime/switch
> > branches constantly to merge correctly.
>
> > Should I submit this to the developer discussion group?
>
> > P.S.
> > So far we figured out the basics of branching works like this:
> > Create a folder inside your trunk for branches
> > Right click a folder to branch > svn > branch > direct it to the
> > branches folder and give it a version # and other details
> > Right click the branched folder and switch to that branch just
> > created.
> > Make a change, commit.
> > Switch back to the original folder we branched off of.
> > Right click the folder > svn > merge > select the branch
>
> > We're going to be working with conceptually 10 branches at a time per
> > software, of about 4-5 softwares being developed.
>
> > --------------------​--------------------​--------------
>
> http://tortoisesvn.t​igris.org/ds/viewMes​sage.do?dsForumId=40​61&dsMessage
> Id
>
> > =1010173
>
> > To unsubscribe from this discussion, e-mail: [users-
> > unsubscr...@tortoise​svn.tigris.org].
>
>
--------------------​--------------------​--------------http://tortoisesvn.t​igris.org/ds/viewMes​sage.do?dsForumId=40​61&dsMess...
>
> To unsubscribe from this discussion, e-mail:
[users-unsubscr...@t​ortoisesvn.tigris.or​g].- Hide quoted text -
>
> - Show quoted text -

--------------------​--------------------​--------------
http://tortoisesvn.t​igris.org/ds/viewMes​sage.do?dsForumId=40​61&dsMessageId=1​010185


To unsubscribe from this discussion, e-mail:
[users-unsubscribe@t​ortoisesvn.tigris.or​g].
Attachments

Re: Branch Control Issue

Author digitalpacman <digitalpacman at hotmail dot com>
Full name digitalpacman <digitalpacman at hotmail dot com>
Date 2009-01-07 09:44:20 PST
Message Yeah Sorry they are at the same root as the trunk, I worded that
incorrectly.


/trunk
/branches

On Jan 7, 9:40 am, Bob Archer <Bob.Arc...@amsi.com> wrote:
> First, I assume you don't put your branches folder IN your trunk folder.
> It should be at the same level as your trunk folder.
>
> Personally, I prefer to tell it to NOT switch to the branch I make and I
> checkout the branch to a separate WC. This makes it much easier to know
> what branch I am working it.
>
> I also make my branches using the repo browser rather than the working
> copy.
>
> I do know that the subclipes client is supposed to have some visual
> branching views and graphs. But, I have never used it.
>
> BOb
>
>
>
>
>
> > -----Original Message-----
> > From: digitalpacman [mailto:digitalpac..​.@hotmail.com]
> > Sent: Wednesday, January 07, 2009 12:33 PM
> > To: us...@tortoisesvn.tigris.org
> > Subject: Branch Control Issue
>
> > Hello,
>
> > I was wondering if anyone else is having a "fun time" using the branch
> > control in TortoiseSVN?
> > My company has expanded to the point where we feel we should start
> > taking advantage of branches, but it seems like an ordeal, with many
> > places for error, using TortoiseSVN.
>
> > Are we missing something? Anyone know of a client that has good branch
> > support?
>
> > Ideally, we would want a client that would manage our branches for us,
> > so we don't have to remember/type in the folders everytime/switch
> > branches constantly to merge correctly.
>
> > Should I submit this to the developer discussion group?
>
> > P.S.
> > So far we figured out the basics of branching works like this:
> > Create a folder inside your trunk for branches
> > Right click a folder to branch > svn > branch > direct it to the
> > branches folder and give it a version # and other details
> > Right click the branched folder and switch to that branch just
> > created.
> > Make a change, commit.
> > Switch back to the original folder we branched off of.
> > Right click the folder > svn > merge > select the branch
>
> > We're going to be working with conceptually 10 branches at a time per
> > software, of about 4-5 softwares being developed.
>
> > --------------------​--------------------​--------------
>
> http://tortoisesvn.t​igris.org/ds/viewMes​sage.do?dsForumId=40​61&dsMessage
> Id
>
> > =1010173
>
> > To unsubscribe from this discussion, e-mail: [users-
> > unsubscr...@tortoise​svn.tigris.org].
>
> --------------------​--------------------​--------------http://tortoisesvn.t​igris.org/ds/viewMes​sage.do?dsForumId=40​61&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr...@t​ortoisesvn.tigris.or​g].- Hide quoted text -
>
> - Show quoted text -

RE: Branch Control Issue

Author "Bob Archer" <Bob dot Archer at amsi dot com>
Full name "Bob Archer" <Bob dot Archer at amsi dot com>
Date 2009-01-07 09:40:04 PST
Message First, I assume you don't put your branches folder IN your trunk folder.
It should be at the same level as your trunk folder.

Personally, I prefer to tell it to NOT switch to the branch I make and I
checkout the branch to a separate WC. This makes it much easier to know
what branch I am working it.

I also make my branches using the repo browser rather than the working
copy.

I do know that the subclipes client is supposed to have some visual
branching views and graphs. But, I have never used it.

BOb

> -----Original Message-----
> From: digitalpacman [mailto:digitalpacma​n@hotmail.com]
> Sent: Wednesday, January 07, 2009 12:33 PM
> To: users at tortoisesvn dot tigris dot org
> Subject: Branch Control Issue
>
> Hello,
>
> I was wondering if anyone else is having a "fun time" using the branch
> control in TortoiseSVN?
> My company has expanded to the point where we feel we should start
> taking advantage of branches, but it seems like an ordeal, with many
> places for error, using TortoiseSVN.
>
> Are we missing something? Anyone know of a client that has good branch
> support?
>
> Ideally, we would want a client that would manage our branches for us,
> so we don't have to remember/type in the folders everytime/switch
> branches constantly to merge correctly.
>
> Should I submit this to the developer discussion group?
>
> P.S.
> So far we figured out the basics of branching works like this:
> Create a folder inside your trunk for branches
> Right click a folder to branch > svn > branch > direct it to the
> branches folder and give it a version # and other details
> Right click the branched folder and switch to that branch just
> created.
> Make a change, commit.
> Switch back to the original folder we branched off of.
> Right click the folder > svn > merge > select the branch
>
> We're going to be working with conceptually 10 branches at a time per
> software, of about 4-5 softwares being developed.
>
> --------------------​--------------------​--------------
>
http://tortoisesvn.t​igris.org/ds/viewMes​sage.do?dsForumId=40​61&dsMessage
Id
> =1010173
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe@tortoise​svn.tigris.org].

Branch Control Issue

Author digitalpacman <digitalpacman at hotmail dot com>
Full name digitalpacman <digitalpacman at hotmail dot com>
Date 2009-01-07 09:32:48 PST
Message Hello,

I was wondering if anyone else is having a "fun time" using the branch
control in TortoiseSVN?
My company has expanded to the point where we feel we should start
taking advantage of branches, but it seems like an ordeal, with many
places for error, using TortoiseSVN.

Are we missing something? Anyone know of a client that has good branch
support?

Ideally, we would want a client that would manage our branches for us,
so we don't have to remember/type in the folders everytime/switch
branches constantly to merge correctly.

Should I submit this to the developer discussion group?

P.S.
So far we figured out the basics of branching works like this:
Create a folder inside your trunk for branches
Right click a folder to branch > svn > branch > direct it to the
branches folder and give it a version # and other details
Right click the branched folder and switch to that branch just
created.
Make a change, commit.
Switch back to the original folder we branched off of.
Right click the folder > svn > merge > select the branch

We're going to be working with conceptually 10 branches at a time per
software, of about 4-5 softwares being developed.
Messages per page: