Rick C. Petty wrote:
On Fri, Dec 12, 2008 at 01:15:17PM +0200, Artis Caune wrote:

I suspect you've run into a well-known svn bug that affects "svn merge".  I
thought they had fixed it with subversion 1.5.4, but apparently it's still
around.  When doing a merge, it seems to randomly touch a bunch of files..
it only updates the svn:mergeinfo property on those files  ...

I've seen this happen only once and eventually figured
out that I had a partial checkout underneath the merge point.
It was especially confusing in my case because I actually
had a complete checkout---nothing was missing---but
one of the directories was marked "depth=immediates"
so it was treated as a partial checkout.

If the svn:mergeinfo has asterisks in it, this is why.

Tim
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-hackers
To unsubscribe, send any mail to "[email protected]"

Reply via email to