You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@incubator.apache.org by "John D. Ament" <jo...@apache.org> on 2016/06/04 14:21:56 UTC
SVN Change?
All,
Did anyone change something recently in SVN? I pulled this morning and got
back a larger than expected amount of content. It seems like the whole
site tree's been duplicated.
John
Re: SVN Change?
Posted by Greg Stein <gs...@gmail.com>.
On Sat, Jun 4, 2016 at 10:21 AM, Marvin Humphrey <ma...@rectangular.com>
wrote:
> On Sat, Jun 4, 2016 at 8:13 AM, John D. Ament <jo...@apache.org>
> wrote:
> > On Sat, Jun 4, 2016 at 11:02 AM Marvin Humphrey <ma...@rectangular.com>
> > wrote:
> >
> >> On Sat, Jun 4, 2016 at 7:21 AM, John D. Ament <jo...@apache.org>
> >> wrote:
> >> > All,
> >> >
> >> > Did anyone change something recently in SVN? I pulled this morning and
> >> got
> >> > back a larger than expected amount of content. It seems like the
> whole
> >> > site tree's been duplicated.
> >>
> >> http://svn.apache.org/viewvc?view=revision&revision=1746519
> >>
> >>
> > :-(
> >
> > Any thoughts on how to fix this? Is it just a matter of deleting a
> > directory tree?
>
> Yeah, it's just `svn rm FULL_URL`. I took care of it.
>
> Please folks: always preview before you commit. With Subversion,
> that's `svn diff`.
I removed additional incorrect files in r1746855.
Comparing the current tree to 1746518 (ie. just before the bad revision),
the only changes are "good changes".
Cheers,
-g
Re: SVN Change?
Posted by Greg Stein <gs...@gmail.com>.
On Mon, Jun 6, 2016 at 5:58 PM, Greg Stein <gs...@gmail.com> wrote:
> On Mon, Jun 6, 2016 at 5:06 PM, William A Rowe Jr <wr...@rowe-clan.net>
> wrote:
>
>> On Sat, Jun 4, 2016 at 10:21 AM, Marvin Humphrey <ma...@rectangular.com>
>> wrote:
>>
>> > On Sat, Jun 4, 2016 at 8:13 AM, John D. Ament <jo...@apache.org>
>> > wrote:
>> > > On Sat, Jun 4, 2016 at 11:02 AM Marvin Humphrey <
>> marvin@rectangular.com>
>> > > wrote:
>> > >
>> > >> On Sat, Jun 4, 2016 at 7:21 AM, John D. Ament <johndament@apache.org
>> >
>> > >> wrote:
>> > >> > All,
>> > >> >
>> > >> > Did anyone change something recently in SVN? I pulled this morning
>> and
>> > >> got
>> > >> > back a larger than expected amount of content. It seems like the
>> > whole
>> > >> > site tree's been duplicated.
>> > >>
>> > >> http://svn.apache.org/viewvc?view=revision&revision=1746519
>> > >>
>> > >>
>> > > :-(
>> > >
>> > > Any thoughts on how to fix this? Is it just a matter of deleting a
>> > > directory tree?
>> >
>> > Yeah, it's just `svn rm FULL_URL`. I took care of it.
>> >
>> > Please folks: always preview before you commit. With Subversion,
>> > that's `svn diff`.
>> >
>>
>> The way to revert without causing a huge update is to remove the target
>> tree, and
>> svn cp -r{rev-before-break} https://s.a.o/r/a/tlp/o/trunk
>> https://s.a.o/r/a/tlp/o/trunk
>> which basically backspaces between what was messed up to what should now
>> be
>> present, which is usually a minimal delta to most people's checkouts
>>
>
> Those instructions are completely wrong :-(
>
> There were changes after the breakage, and the above would have reverted
> those.
>
And note: even if you caught it before further changes were made, by
removing trunk, then copying another trunk back in ... it *completely*
messes with history. "trunk" would be based on a copy, and that is a
*significant* change. Such copies are why "svn log" has a switch named
--stop-on-copy.
So no. Never rm trunk and copy from old. Use reverse merges.
-g
Re: SVN Change?
Posted by Greg Stein <gs...@gmail.com>.
On Mon, Jun 6, 2016 at 5:06 PM, William A Rowe Jr <wr...@rowe-clan.net>
wrote:
> On Sat, Jun 4, 2016 at 10:21 AM, Marvin Humphrey <ma...@rectangular.com>
> wrote:
>
> > On Sat, Jun 4, 2016 at 8:13 AM, John D. Ament <jo...@apache.org>
> > wrote:
> > > On Sat, Jun 4, 2016 at 11:02 AM Marvin Humphrey <
> marvin@rectangular.com>
> > > wrote:
> > >
> > >> On Sat, Jun 4, 2016 at 7:21 AM, John D. Ament <jo...@apache.org>
> > >> wrote:
> > >> > All,
> > >> >
> > >> > Did anyone change something recently in SVN? I pulled this morning
> and
> > >> got
> > >> > back a larger than expected amount of content. It seems like the
> > whole
> > >> > site tree's been duplicated.
> > >>
> > >> http://svn.apache.org/viewvc?view=revision&revision=1746519
> > >>
> > >>
> > > :-(
> > >
> > > Any thoughts on how to fix this? Is it just a matter of deleting a
> > > directory tree?
> >
> > Yeah, it's just `svn rm FULL_URL`. I took care of it.
> >
> > Please folks: always preview before you commit. With Subversion,
> > that's `svn diff`.
> >
>
> The way to revert without causing a huge update is to remove the target
> tree, and
> svn cp -r{rev-before-break} https://s.a.o/r/a/tlp/o/trunk
> https://s.a.o/r/a/tlp/o/trunk
> which basically backspaces between what was messed up to what should now be
> present, which is usually a minimal delta to most people's checkouts
>
Those instructions are completely wrong :-(
There were changes after the breakage, and the above would have reverted
those. No, the *correct* thing is a reverse merge of the offending change.
However, Marvin partially did that with an "rm" of one subtree, which would
make a reverse merge harder (not impossible tho). I followed up his change
with another, to completely remove all the offending new files.
Cheers,
-g
Re: SVN Change?
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
On Sat, Jun 4, 2016 at 10:21 AM, Marvin Humphrey <ma...@rectangular.com>
wrote:
> On Sat, Jun 4, 2016 at 8:13 AM, John D. Ament <jo...@apache.org>
> wrote:
> > On Sat, Jun 4, 2016 at 11:02 AM Marvin Humphrey <ma...@rectangular.com>
> > wrote:
> >
> >> On Sat, Jun 4, 2016 at 7:21 AM, John D. Ament <jo...@apache.org>
> >> wrote:
> >> > All,
> >> >
> >> > Did anyone change something recently in SVN? I pulled this morning and
> >> got
> >> > back a larger than expected amount of content. It seems like the
> whole
> >> > site tree's been duplicated.
> >>
> >> http://svn.apache.org/viewvc?view=revision&revision=1746519
> >>
> >>
> > :-(
> >
> > Any thoughts on how to fix this? Is it just a matter of deleting a
> > directory tree?
>
> Yeah, it's just `svn rm FULL_URL`. I took care of it.
>
> Please folks: always preview before you commit. With Subversion,
> that's `svn diff`.
>
The way to revert without causing a huge update is to remove the target
tree, and
svn cp -r{rev-before-break} https://s.a.o/r/a/tlp/o/trunk
https://s.a.o/r/a/tlp/o/trunk
which basically backspaces between what was messed up to what should now be
present, which is usually a minimal delta to most people's checkouts
Re: SVN Change?
Posted by Andrew Purtell <ap...@apache.org>.
Hi Yanping,
Please be advised of the below.
If you were trying to commit a change to the incubator status files, the
commit was not correct and has been reverted.
On Sat, Jun 4, 2016 at 8:21 AM, Marvin Humphrey <ma...@rectangular.com>
wrote:
> On Sat, Jun 4, 2016 at 8:13 AM, John D. Ament <jo...@apache.org>
> wrote:
> > On Sat, Jun 4, 2016 at 11:02 AM Marvin Humphrey <ma...@rectangular.com>
> > wrote:
> >
> >> On Sat, Jun 4, 2016 at 7:21 AM, John D. Ament <jo...@apache.org>
> >> wrote:
> >> > All,
> >> >
> >> > Did anyone change something recently in SVN? I pulled this morning and
> >> got
> >> > back a larger than expected amount of content. It seems like the
> whole
> >> > site tree's been duplicated.
> >>
> >> http://svn.apache.org/viewvc?view=revision&revision=1746519
> >>
> >>
> > :-(
> >
> > Any thoughts on how to fix this? Is it just a matter of deleting a
> > directory tree?
>
> Yeah, it's just `svn rm FULL_URL`. I took care of it.
>
> Please folks: always preview before you commit. With Subversion,
> that's `svn diff`.
>
> Marvin Humphrey
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
> For additional commands, e-mail: general-help@incubator.apache.org
>
>
--
Best regards,
- Andy
Problems worthy of attack prove their worth by hitting back. - Piet Hein
(via Tom White)
Re: SVN Change?
Posted by Marvin Humphrey <ma...@rectangular.com>.
On Sat, Jun 4, 2016 at 8:13 AM, John D. Ament <jo...@apache.org> wrote:
> On Sat, Jun 4, 2016 at 11:02 AM Marvin Humphrey <ma...@rectangular.com>
> wrote:
>
>> On Sat, Jun 4, 2016 at 7:21 AM, John D. Ament <jo...@apache.org>
>> wrote:
>> > All,
>> >
>> > Did anyone change something recently in SVN? I pulled this morning and
>> got
>> > back a larger than expected amount of content. It seems like the whole
>> > site tree's been duplicated.
>>
>> http://svn.apache.org/viewvc?view=revision&revision=1746519
>>
>>
> :-(
>
> Any thoughts on how to fix this? Is it just a matter of deleting a
> directory tree?
Yeah, it's just `svn rm FULL_URL`. I took care of it.
Please folks: always preview before you commit. With Subversion,
that's `svn diff`.
Marvin Humphrey
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
For additional commands, e-mail: general-help@incubator.apache.org
Re: SVN Change?
Posted by "John D. Ament" <jo...@apache.org>.
On Sat, Jun 4, 2016 at 11:02 AM Marvin Humphrey <ma...@rectangular.com>
wrote:
> On Sat, Jun 4, 2016 at 7:21 AM, John D. Ament <jo...@apache.org>
> wrote:
> > All,
> >
> > Did anyone change something recently in SVN? I pulled this morning and
> got
> > back a larger than expected amount of content. It seems like the whole
> > site tree's been duplicated.
>
> http://svn.apache.org/viewvc?view=revision&revision=1746519
>
>
:-(
Any thoughts on how to fix this? Is it just a matter of deleting a
directory tree?
> Marvin Humphrey
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
> For additional commands, e-mail: general-help@incubator.apache.org
>
>
Re: SVN Change?
Posted by Marvin Humphrey <ma...@rectangular.com>.
On Sat, Jun 4, 2016 at 7:21 AM, John D. Ament <jo...@apache.org> wrote:
> All,
>
> Did anyone change something recently in SVN? I pulled this morning and got
> back a larger than expected amount of content. It seems like the whole
> site tree's been duplicated.
http://svn.apache.org/viewvc?view=revision&revision=1746519
Marvin Humphrey
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@incubator.apache.org
For additional commands, e-mail: general-help@incubator.apache.org