You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com> on 2008/01/22 11:44:15 UTC
Re: svn commit: r28979 - in trunk: . notes subversion/include subversion/include/private subversion/libsvn_client subversion/libsvn_fs subversion/libsvn_fs_base subversion/libsvn_fs_base/notes subversion/libsvn_fs_base/util subversion/libsvn_fs_fs su
r28979 reverted r28978 :( .
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r28979 - in trunk: . notes subversion/include subversion/include/private
subversion/libsvn_client subversion/libsvn_fs subversion/libsvn_fs_base subversion/libsvn_fs_base/notes
subversion/libsvn_fs_base/util subversion/libsvn_fs_fs su
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Arfrever Frehtes Taifersar Arahesis wrote:
> r28979 reverted r28978 :( .
r28989 restored r28978.
-Hyrum
Re: svn commit: r28979 - in trunk: . notes subversion/include subversion/include/private subversion/libsvn_client subversion/libsvn_fs subversion/libsvn_fs_base subversion/libsvn_fs_base/notes subversion/libsvn_fs_base/util subversion/libsvn_fs_fs su
Posted by Karl Fogel <kf...@red-bean.com>.
"David Glasser" <gl...@davidglasser.net> writes:
> On Jan 22, 2008 8:44 AM, Karl Fogel <kf...@red-bean.com> wrote:
>> "Arfrever Frehtes Taifersar Arahesis" <ar...@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.
>
> Actually, wouldn't it have just diffed from trunk@28977 and it
> wouldn't have been a problem?
Rather, yes, that's what it would have done (as I should have done).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r28979 - in trunk: . notes subversion/include subversion/include/private subversion/libsvn_client subversion/libsvn_fs subversion/libsvn_fs_base subversion/libsvn_fs_base/notes subversion/libsvn_fs_base/util subversion/libsvn_fs_fs su
Posted by David Glasser <gl...@davidglasser.net>.
On Jan 22, 2008 8:44 AM, Karl Fogel <kf...@red-bean.com> wrote:
> "Arfrever Frehtes Taifersar Arahesis" <ar...@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.
Actually, wouldn't it have just diffed from trunk@28977 and it
wouldn't have been a problem?
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r28979 - in trunk: . notes subversion/include subversion/include/private subversion/libsvn_client subversion/libsvn_fs subversion/libsvn_fs_base subversion/libsvn_fs_base/notes subversion/libsvn_fs_base/util subversion/libsvn_fs_fs su
Posted by Karl Fogel <kf...@red-bean.com>.
"Arfrever Frehtes Taifersar Arahesis" <ar...@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@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org