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
Monday: Create a branch; Do some work; Check in to branch;
Tuesday through Thursday: Merge recent changes from the trunk; Do some
Friday: Merge recent changes from the trunk; Do some work; Check in to
I know that, in general, biderectional merges are a problem. But
1. Use svnmerge to track which changes sets have been merged in each
2. Only merge trunk changes into a fully up-to-date, unmodified copy
3. Whenever there is a conflict merging trunk changes into the branch,
3. Always commit immediately after merging trunk changes into the
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.orgReceived on Sun Jun 12 06:22:59 2005 |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.