Steven Watanabe wrote:
(1). The thing is, in svn, we can operate on any subtree, and ignore the rest of the repository. So, for example, given the following situation:
revision 1: branch A revision 2: branch B revision 3: branch A revision 4: branch B
If we want to undo the most recent change to branch A, the command is
svn merge -r HEAD:2 branches/A
Revision 4 doesn't affect branch A, so it's left alone.
isn't this scenario a somewhat basic feature of a version control system ? doesn't every SCM support that ? Steven Watanabe wrote:
The latter would mean that svn could, for example, prevent me from doing the following: checkout the entire /branches directory, make edits on both /branches/A and /brances/B, then commit all changes together in one revision.
svn allows this, although I've never seen anyone actually do it.
yeah, and I think a developer who does something like that is really giving the integrator a hard time. merging two branches back to the trunk is essentially merging three development lines at the same time and i can think of no reason why this should be necessary.