On Fri, Jul 30, 2010 at 12:38 PM, Mitchell Stokes moguri...@gmail.com wrote:
I'm thinking now the best idea would be to re-branch and merge the
individual revisions from my branch to the new one. I think it should work
and would be better than doing a lot of manual merging.
This is what I do
Hello devs,
I'm looking for a bit of advice. A couple of days ago, my mentor and I
realized that some of the merges earlier in the project were done poorly,
which is now starting to cause some issues. I'm thinking the best way to
resolve this is to diff against the trunk and clean up the
Hey,
I had exactly the same problem last summer! What I did then in the end is
merging by hand when I was allowed to merge my branch to trunk. That wasn't
too much a problem as most files were new and in a separate directory
(audaspace).
Since then I'm poking Ton to update the svn server,
Like Campbell:
Be careful not to shoot you in the foot with weapons like this:
svn status|grep pattern|awk '{print $2}'| xargs what-to-do-with-those-files
replace pattern and what-to-do-with-those-files
xavier
2010/7/30 neXyon nex...@gmail.com:
Hey,
I had exactly the same problem last
