RE: Re: Question regarding branching

Well that help a bit, thanks... The only thing that is throwing me a bit
is this...

app1file1, app1file2, and app1file3 are located in the trunk WITH
app2file1, app2file2, and app2file3 so I'm not really sure that I can do
a straight copy in order to make a branch.

Is it possible to take just app1file1, app1file2, and app1file3 and
branch those even though there are in the trunk with the other files?

-----Original Message-----
From: Roger Keays [mailto:r.keays@ninthave.net]
Sent: Tuesday, June 22, 2004 5:37 PM
To: users@subversion.tigris.org
Subject: Re: Question regarding branching

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 \
           svn+ssh://your-host/repository/branches/app1-branch

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.

Roger

-- 
-------------------------------------------------------------
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
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org