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

Re: Question regarding branching

From: Roger Keays <r.keays_at_ninthave.net>
Date: 2004-06-22 23:37:13 CEST

Hi Jeff,

> I have a question with regarding branching.
> Let's say I have a project that contains the following files:
> application1file1
> application1file2
> application1file3
> ...
> application2file1
> application2file2
> application2file3
> Each of these files are checked into repository/project/trunk
> Ok, as development goes on, I'm working on application2's files and when the "powers at be" want me to make a change to application1's files.
> Well here is the dilemma. I went ahead and make the changes to application1's files. Now the "powers at be" decide that they don't want the changes I just did for application1's file in the mainline code.
> So the dilemma. Is there a way to branch just application1's files and then merge them back into the mainline in the future?

Well, you should be able to create a branch for app1 easily enough with

svn copy svn+ssh://your-host/repository/trunk/application1 \

I haven't done much with merging using svn yet, but AFAICT the merge would be
done like any other, but slightly mismatched urls (merge /branch/dir to
/trunk/dir instead of /trunk)

Hope that helps.


Ninth Avenue Software                      p: +61 7 3870 8494
       _       _       _                    f: +61 7 3870 8491
    __(@)<  __(@)>  __(@),          w: http://www.ninthave.net
    \___)   \___)   \___)                 e: info@ninthave.net
PO Box 4179                             Send your spam to Sam
St Lucia South                               sam@ninthave.net
Queensland 4067
Australia                         http://www.ninthave.net/sam
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jun 23 00:52:17 2004

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.