|
|
|
|
|
|
by prodigal_erik
6007 days ago
|
|
|
We do that, and I will say that svnmerge.py doesn't work very well with older versions of svn. A common failure mode is when you merge from trunk to rebase a dev branch and find a conflict, your edits to resolve it are automatically ignored and not reflected back to trunk, and any overlapping edits you make later will eventually cause new conflicts when you finally go to trunk. Apparently the new svn:mergeinfo property helps, but we haven't migrated at work so I don't know how well. |
|
|