[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: after merge, svn st -u fails with XML error

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-03-12 15:27:27 CET

Jan Evert van Grootheest wrote:

> A /products/trunk/components/framework/mc/ui/static/xsl/envlist.xsl
> (from
> /products/branch/issysd25/mcStyleSheets/components/framework/mc/ui/static/xsl/envlist.xsl:2581)
>
> M /products/trunk/components/framework/mc/ui/static/xsl/error.xsl

Read chapter 4 about merging. SVN doesn't yet do any merge-tracking.
It has *no* idea that your commit was the result of a merge. Y

The "from path:revision" stuff you're seeing is what 'svn log' always
shows whenever you copy files. It's show the copy ancestor as usual.
You get that anytime files are copied, it has nothing to do with merging.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Mar 12 15:28:58 2004

This is an archived mail posted to the Subversion Users mailing list.