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

答复: How to continually sync changes from trunk to branches?

From: 张宇 <zhangyu_at_vancl.cn>
Date: Wed, 24 Jun 2009 12:10:50 +0800

Does “reintegrate a branch” in TSVN compliant to this daily merge practice?

发件人: Ryan Schmidt [mailto:subversion-2009b_at_ryandesign.com]
发送时间: 2009年6月24日 1:57
收件人: 张宇
抄送: users_at_subversion.tigris.org; liyoubo_at_vancl.cn
主题: Re: How to continually sync changes from trunk to branches?

On Jun 23, 2009, at 06:44, 张宇 wrote:

> After days of using SVN, we found an issue of branching. When a branch
> separate from trunk after a long long time, It's difficult to merge
> back to
> the trunk, there will be a lot of conflicts and even tree
> conflicts. We are
> using an approach that merge changes from trunk to every branch
> daily. Does
> this the right approach? What's the best practice for long term
> branching
> for an easy merge in the end?

Merging often (maybe daily, maybe weekly, depending on the activity
in your project and the extent of the changes being made) should
reduce the problems you encounter when merging.

> Another question, I think SVN should do better at supporting renaming
> directories. I am confused why I must merge file manually when I
> renamed the
> parent directory?

This could come under the "true renames" enhancement:



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-06-24 06:11:57 CEST

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