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

RE: branching: dragging along other branch

From: Campbell, Matthew A <Matthew.Campbell_at_Relizon.com>
Date: 2004-07-06 19:44:35 CEST

Sounds like you don't really want to branch. Branching is designed to keep
the changes to the trunk and the branches separate and to keep the two as
separate units. From your illustration it seems like you would be OK with
just a regular checkout of the trunk, doing periodic "svn update" commands
to keep your A and B files in sync. Otherwise, I think you would need to do
checkout and merge every time you work on the branch...

Perhaps I'm not understanding the illustration properly...

> -----Original Message-----
> From: Thom Borton [mailto:borton@phys.ethz.ch]
> Sent: Tuesday, July 06, 2004 10:32 AM
> To: users@subversion.tigris.org
> Subject: branching: dragging along other branch
>
>
>
> Hello
>
> I have the following problem to which I don't find a solution:
>
> I have several files in the trunc of a project/repository, let's call
> them A, B and C.
>
> Now I want to create a branch of the project, in which I will make
> changes to file C, call the new one C'.
>
> Meanwhile, the development of files A and B in the trunc will go on,
> call them A_ and B_. I know that the development of these
> files does not
> interfere with file C.
>
> When I do a checkout of the branch, I will get the files A, B
> (from when
> the branch was initiated) and C' which is the last change to C of the
> branch that I commited.
>
> BUT: What I want is to checkout the new A_ and B_ and the new
> C', i.e.
> "the newest of trunc and branch".
>
> Is this possible?
>
> Thanks a lot for the help.
>
> Yours, Tobias
>
> --
> Thom Borton
> Switzerland
>
>
> ---------------------------------------------------------------------
> 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
Received on Tue Jul 6 21:23:21 2004

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