[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:43:26 -0700

"David Glasser" <glasser_at_davidglasser.net> writes:

> I say this because with a clean 1.5.x checkout at r30560 and a clean
> trunk svn from the same revision, I just get:
>
> glasser_at_filthy-assistant:~/Projects/Subversion/svn-1.5.x$ svn merge
> --accept theirs-full http://svn.collab.net/repos/svn/trunk/CHANGES
> CHANGES
> --- Merging r1283 through r30560 into 'CHANGES':
> G CHANGES

Huh. OK, what's going on?

# wc i built
0 subversion2% svnversion
30560

0 1.5.x% svn --version
svn, version 1.6.0 (dev build)
   compiled Apr 11 2008, 23:36:34
0 1.5.x% svnversion
30560
0 1.5.x% time svn merge --accept theirs-full
http://svn.collab.net/repos/svn/trunk/CHANGES CHANGES
--- Merging r29081 through r29084 into 'CHANGES':
U CHANGES
--- Merging r29885 through r29894 into 'CHANGES':
G CHANGES
--- Merging r29901 through r29913 into 'CHANGES':
G CHANGES
--- Merging r29931 through r29938 into 'CHANGES':
G CHANGES
/opt/svn/subversion2/bin/svn merge --accept theirs-full CHANGES 4.50s user 1.28s system 6% cpu 1:31.03 total

-- 
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:43:36 CEST

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