On Sat, Feb 13, 2010 at 3:18 PM, Robin Anil <robin.a...@gmail.com> wrote:
> Sorry about that Jake, At one point we had to do this. My feeling was that, > this was a better time(with most of the issues closed and all) to this, and > would have proved impossible later. > I guess... but it may come a time in the future when "we have to do this", and I would advocate *not* doing it, actually. It just clutters the subversion history, and can usually be adequately dealt with by accumulating these stylistic fixes over time, IMO. > Robin > PS: I volunteer to help you in getting all the conflicts resolved and > checking it in(Offer goes only to the open issues with active work at the > moment) > Thanks, but it's straightforward enough for me to do a whole bunch of "svn merge --dry-run -r BASE:HEAD ." and then working my way through various subdirectories. It's just extra work. I'll try to just get in the habit of checking in my minor changes more frequently so I don't run into this more. -jake
