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

Can carefully controlled biderectional merging be safe?

From: Scott V. McGuire <smcguire_at_nyc.rr.com>
Date: 2005-06-12 06:21:16 CEST

I'm trying to figure out a way to make things like the following
example workable:

Monday: Create a branch; Do some work; Check in to branch;

Tuesday through Thursday: Merge recent changes from the trunk; Do some
work; Check in to branch;

Friday: Merge recent changes from the trunk; Do some work; Check in to
branch; Merge changes from branch into the trunk;

I know that, in general, biderectional merges are a problem. But
could they be safe under some restricted useage patterns? I have in
mind:

1. Use svnmerge to track which changes sets have been merged in each
   direction.

2. Only merge trunk changes into a fully up-to-date, unmodified copy
   of the branch. (I think svnmerge requires this.)

3. Whenever there is a conflict merging trunk changes into the branch,
   keep the version from the local copy of the branch.
   (I.e. filename.working)

3. Always commit immediately after merging trunk changes into the
   branch.

Would this be safe?

Thanks,

-- 
Scott V. McGuire
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Jun 12 06:22:59 2005

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