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

Re: automatically merge changes between branches of a project.

From: Jacob Atzen <jacob_at_aub.dk>
Date: 2005-01-26 11:22:28 CET

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
Received on Wed Jan 26 11:24:58 2005

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