On Thu, 2009-09-17 at 17:58 -0400, M. Ranganathan wrote: > Hello, > > For some inexplicable reason I have two files on my local checkout > from svn that keep getting committed: > > lib/freeswitch/upgradenotes.txt
This file was created in rev. 16132 by Woof. You've modified it in revs. 16514 16423 16368 16318, specifically, you've modified the svn:mergeinfo property. And I see that all 4 of those revs. have been merges. But in rev. 16514 the source of the merge doesn't modify those files, although your working copy gets them merged. I'd check what your merge tool is doing. The svnmerge.py that I use has a "-s" option that shows in detail what it is doing. Dale _______________________________________________ sipx-dev mailing list [email protected] List Archive: http://list.sipfoundry.org/archive/sipx-dev Unsubscribe: http://list.sipfoundry.org/mailman/listinfo/sipx-dev sipXecs IP PBX -- http://www.sipfoundry.org/
