You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Taner Diler <ta...@riskturk.com> on 2005/01/26 09:52:15 UTC
automatically merge changes between branches of a project.
Hi everyone;
We have created a branch, names as PROJECT_V4, of the project in svn repository. After that, we have renamed the original project as PROJECT_V3. The main goal is that we will add new properties and new user interfaces to PROJECT_V4. We will not give this version to our customers but we will give PROJECT_V3.
What I want to learn is how I can do that when we solve a bug in PROJECT_V3, this solution should be automatically reflected to PROJECT_V4. Is it possible?
Taner Diler
Yazilim Mühendisi
Risk Yazilim Teknolojileri
Tel : 0 212 328 26 89
www.riskturk.com
www.obje7.com
Re: automatically merge changes between branches of a project.
Posted by Jacob Atzen <ja...@aub.dk>.
On Wed, Jan 26, 2005 at 12:21:42PM +0100, allan juul wrote:
> > No, not automatically. You will need to manually merge all changes to
> > your V4. Chapter 4 of the book[1] shows how to do this.
> >
> > [1]: <http://svnbook.red-bean.com/en/1.1/ch04.html>
>
>
> when you (Jacob) say "manually" you mean: "manually invoke svn merge",
> right ?
Yes.
--
Cheers,
- Jacob Atzen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: automatically merge changes between branches of a project.
Posted by allan juul <la...@inet.uni2.dk>.
Quoting Jacob Atzen <ja...@aub.dk>:
> On Wed, Jan 26, 2005 at 11:52:15AM +0200, Taner Diler wrote:
> > We have created a branch, names as PROJECT_V4, of the project in svn
> > repository. After that, we have renamed the original project as
> > PROJECT_V3. The main goal is that we will add new properties and new
> > user interfaces to PROJECT_V4. We will not give this version to our
> > customers but we will give PROJECT_V3.
> >
> > What I want to learn is how I can do that when we solve a bug in
> > PROJECT_V3, this solution should be automatically reflected to
> > PROJECT_V4. Is it possible?
>
> No, not automatically. You will need to manually merge all changes to
> your V4. Chapter 4 of the book[1] shows how to do this.
>
> [1]: <http://svnbook.red-bean.com/en/1.1/ch04.html>
when you (Jacob) say "manually" you mean: "manually invoke svn merge", right ?
./allan
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: automatically merge changes between branches of a project.
Posted by Jacob Atzen <ja...@aub.dk>.
On Wed, Jan 26, 2005 at 11:52:15AM +0200, Taner Diler wrote:
> We have created a branch, names as PROJECT_V4, of the project in svn
> repository. After that, we have renamed the original project as
> PROJECT_V3. The main goal is that we will add new properties and new
> user interfaces to PROJECT_V4. We will not give this version to our
> customers but we will give PROJECT_V3.
>
> What I want to learn is how I can do that when we solve a bug in
> PROJECT_V3, this solution should be automatically reflected to
> PROJECT_V4. Is it possible?
No, not automatically. You will need to manually merge all changes to
your V4. Chapter 4 of the book[1] shows how to do this.
[1]: <http://svnbook.red-bean.com/en/1.1/ch04.html>
--
Cheers,
- Jacob Atzen
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org