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

Re: [BUG] Borked 1.5.x CHANGES merging

From: Eric Gillespie <epg_at_pretzelnet.org>
Date: Fri, 11 Apr 2008 23:30:26 -0700

"David Glasser" <glasser_at_davidglasser.net> writes:

> Can you add svnversion of your wc before you run "svn merge", and the
> revision/tag of the svn you're running?

Well, I updated before I started:

Updated to revision 30560.

So yeah:

0 1.5.x% svnversion .
30560

I am running rc2:

0 1.5.x% svn --version
svn, version 1.5.0 (Release Candidate 2)
   compiled Apr 11 2008, 11:59:45

--
Eric Gillespie <*> epg_at_pretzelnet.org

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-12 08:30:36 CEST

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