accumulo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Corey Nolet <cjno...@gmail.com>
Subject Re: svn commit: r1484644 - in /accumulo/branches/1.5: ./ mini/ mini/src/ mini/src/main/ mini/src/main/java/ mini/src/main/java/org/ mini/src/main/java/org/apache/ mini/src/main/java/org/apache/accumulo/ mini/src/main/java/org/apache/accumulo/mini/ mini/src...
Date Tue, 21 May 2013 15:54:22 GMT
Doing "svn merge -r 1484792:1484643 ." seemed to reverse the two commits
correctly without any conflicts (it correctly removed the mini/ directory
as well). I think this worked.


On Tue, May 21, 2013 at 11:40 AM, Keith Turner <keith@deenlo.com> wrote:

> On Tue, May 21, 2013 at 11:37 AM, Corey Nolet <cjnolet@gmail.com> wrote:
>
> > I just did a revert locally. In your svn status above, was there a reason
> > for not doing an "svn delete mini" to get rid of the mini directory that
> > was created?
> >
>
> No, I was not sure what was going on w/ that directory.  I knew there was
> something screwy, but I did not want to bother figuring out what I should
> do if you were going to work on it.
>
> If you get this to work.. I would be interested in seeing what svn commands
> you used.
>
>
> >
> >
> > On Tue, May 21, 2013 at 11:19 AM, Corey Nolet <cjnolet@gmail.com> wrote:
> >
> > > I'd like to try it if you don't mind. The only way to learn is to do.
> > >
> > > I'll hold on committing the change until i'm 100% confident that I'm
> not
> > > going to make the problem worse.
> > >
> > >
> > > On Tue, May 21, 2013 at 11:13 AM, Keith Turner <keith@deenlo.com>
> wrote:
> > >
> > >> On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cjnolet@gmail.com>
> > wrote:
> > >>
> > >> > Ill revert this and redo. Still getting used to svn.
> > >> >
> > >>
> > >> let me know if you want me to do the revert.
> > >>
> > >>
> > >> > Corey,
> > >> >
> > >> > It seems these move were not done is such a way that history was
> > >> preserved.
> > >> >   'svn move' should be used, it preserves history.   Although I
> never
> > >> use
> > >> > this.  When I move things around in eclipse it automatically does
> 'svn
> > >> > move'.
> > >> >
> > >> > I looked into how to fix this.  There does not seem to be an easy
> way
> > >> other
> > >> > than reverting the changes and doing a move.
> > >> >
> > >> > Keith
> > >> >
> > >> >
> > >> > On Mon, May 20, 2013 at 10:12 PM, <cjnolet@apache.org> wrote:
> > >> >
> > >> > > Author: cjnolet
> > >> > > Date: Tue May 21 02:12:28 2013
> > >> > > New Revision: 1484644
> > >> > >
> > >> > > URL: http://svn.apache.org/r1484644
> > >> > > Log:
> > >> > > ACCUMULO-1438 Moving MiniAccumuloCluster into mini module
> > >> > >
> > >> > >
> > >> >
> > >>
> > >
> > >
> >
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message