[crossfire] Using svnmerge for backporting to branch?
Mark Wedel
mwedel at sonic.net
Thu Feb 21 01:43:28 CST 2008
Perhaps the biggest problem with using svnmerge is getting everyone to use it.
For myself, I've been doing merges with 'svn merge ...'
Do have a few questions however:
What happens if someone doesn't use svnmerge - makes change in trunk, and then
still does manual merge in branch? I'm guessing it would try to re-merge it then?
Given fairly big code changes in the server from trunk and client (item
refactoring, some others), one gets more cases of automatic merges not working.
I'm guessing this really doesn't change much (svnmerge won't get confused with
those changes?)
What about 'reverse' commits? It doesn't happen very often, but sometimes I
make the bugfix first on the branch, and then commit back to server?
More information about the crossfire
mailing list