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

Re: branching several times a day

From: Nuutti Kotivuori <naked_at_iki.fi>
Date: 2004-03-13 01:24:30 CET

Brad Appleton wrote:
> On Fri, Mar 12, 2004 at 02:37:35PM -0500, Rob van Oostrum wrote:
>> - it destroys the integrity of the private branch. Instead
>> of being able to easily identify the changes made on the
>> branch for the purpose for which the branch was created
>
> I think I noted that. I don't think it destroys the integrity,
> just makes it harder to identify (it is still there though).

Yes, harder to identify.

> When/if SVN can do smart merging (as some other tools do today)
> then the problem goes away.

Smart merging does *not* make the problem go away. It merely makes it
so that the merge will not conflict when you merge back to the
mainline. The history information from this 'merge from trunk' is
still there, and it can be seen in the invidual change-sets on the
branch.

Eg. it just makes it bother less, but it is still there.

-- Naked

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Mar 13 01:26:18 2004

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