"Arfrever Frehtes Taifersar Arahesis" <arfrever.fta_at_gmail.com> writes:
> r28979 reverted r28978 :( .
Oh, duh. Completely my fault. If we'd had reintegrate support on the
server, I would have used --reintegrate, and it would have told me I
wasn't as up-to-date as I thought I was. My apologies. As it
happens, Hyrum Wright just beat me to fixing it:
$ svn merge -c28978 .
--- Merging r28978 into '.':
U subversion/tests/cmdline/svnadmin_tests.py
U subversion/libsvn_repos/load.c
$ svn st -q
M subversion/tests/cmdline/svnadmin_tests.py
M subversion/libsvn_repos/load.c
$ svn ci -m "Restore r28978, which r28979 accidentally reverted."
Sending subversion/libsvn_repos/load.c
subversion/libsvn_client/commit.c:916: (apr_err=160024)
svn: Commit failed (details follow):
subversion/libsvn_ra_neon/commit.c:490: (apr_err=160024)
svn: File or directory 'libsvn_repos/load.c' is out of date;
try updating
subversion/libsvn_ra_neon/util.c:711: (apr_err=160024)
svn: The version resource does not correspond to the resource within
the transaction. Either the requested version resource is out of
date (needs to be updated), or the requested version resource is
newer than the transaction root (restart the commit).
$ svn up
G subversion/tests/cmdline/svnadmin_tests.py
G subversion/libsvn_repos/load.c
Updated to revision 28989.
$ shlog
$ svn log -r28989
------------------------------------------------------------------------
r28989 | hwright | 2008-01-22 11:39:37 -0500 (Tue, 22 Jan 2008) | 2 lines
Reapply r28978, which was accidentally reverted by a merge in r28979.
------------------------------------------------------------------------
$
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-22 17:44:53 CET