0x0E Bitsraised in a barn by hippy wolves

Fri Jan 16 14:38:00 CST 2009

stevesuehs: feel free to email your bash history file containing the commands in which you did the merge that repro your svn issue.

CowOrker: svn status | sed 's|\|\/|g' | grep '^[MAD]' | grep -v swf | grep -v examplealpha | grep -v di97 | grep -v log4j | sed 's/+/ /' | awk '{print $2}' | xargs svn commit -m 'merge --depth=infinity -r32960:33020 http://svn/repos/trunk/di.main'

stevesuehs: that's insane and I can't support it.

stevesuehs: commit should be one commit from the top of the repository

Yes, I can read it. I can also ride horseback, nap flint, and start a fire with yucca sticks and a shoe string. For some reason, I almost always drive a Prius and commit merges with a very simple svn commit command. Maybe because it hurts less.