You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@accumulo.apache.org by Keith Turner <ke...@deenlo.com> on 2013/05/21 16:23:40 UTC
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...
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, <cj...@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
>
>
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...
Posted by Keith Turner <ke...@deenlo.com>.
BTW
revision can be reverted w/ a negative. For example to revert revision 9
and 4 could do the following
svn merge -c -9 .
svn merge -c -4 .
On Tue, May 21, 2013 at 10:23 AM, Keith Turner <ke...@deenlo.com> wrote:
> 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, <cj...@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
>>
>>
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...
Posted by Keith Turner <ke...@deenlo.com>.
On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@gmail.com> wrote:
> Ill revert this and redo. Still getting used to svn.
>
Yeah, svn is quirky w/ this type of stuff, I am still learning too when it
comes to these corner cases.
I just did an experiment on my local 1.5 I did the following..
svn merge -c -1484792 .
svn merge -c -1484644 .
resolve --accept=working mini
svn status shows the following. I looked at the docs, the '+' means that
history changes are scheduled. So I think this means the history will come
back, but not positive. Not completely sure I resolved the tree conflict
correctly.
svn status
M test/compat/japi-compliance/japi-accumulo-1.4.xml
M test/system/upgrade_test.sh
M
test/src/test/java/org/apache/accumulo/fate/zookeeper/ZooLockTest.java
M test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
M
test/src/test/java/org/apache/accumulo/test/TestAccumuloSplitRecovery.java
M test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
M test/pom.xml
M proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
M proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java
M proxy/pom.xml
M pom.xml
M assemble/pom.xml
M mini/pom.xml
M README
A + server/src/test/java/org/apache/accumulo/server/mini
A +
server/src/test/java/org/apache/accumulo/server/mini/MiniAccumuloClusterTest.java
A + server/src/test/resources/FooFilter.jar
M server/src/test/resources/log4j.properties
A + server/src/main/java/org/apache/accumulo/server/mini
A +
server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloCluster.java
A +
server/src/main/java/org/apache/accumulo/server/mini/MiniAccumuloConfig.java
I am thinking it would be best to revert in each branch. Then merge from
1.5 to 1.6 w/o making changes, and just commit the props that mark the
merge as done.
> 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, <cj...@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
> >
> >
>
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...
Posted by Christopher <ct...@apache.org>.
On Tue, May 21, 2013 at 11:58 AM, Keith Turner <ke...@deenlo.com> wrote:
> On Tue, May 21, 2013 at 11:54 AM, Corey Nolet <cj...@gmail.com> wrote:
>
>> 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.
>>
>
> I suppose only the mini move commits fall in that range?
Hopefully... otherwise, the alternative to reverse a merge is to do:
svn merge -c -ZZZZZZ,-YYYYYY,-XXXXXX
(note the dash prior to each rev, and that the revs are in descending
order... or ascending towards zero, if you treat the dash as a
negative sign)
>>
>>
>> On Tue, May 21, 2013 at 11:40 AM, Keith Turner <ke...@deenlo.com> wrote:
>>
>> > On Tue, May 21, 2013 at 11:37 AM, Corey Nolet <cj...@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 <cj...@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 <ke...@deenlo.com>
>> > wrote:
>> > > >
>> > > >> On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@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, <cj...@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
>> > > >> > >
>> > > >> > >
>> > > >> >
>> > > >>
>> > > >
>> > > >
>> > >
>> >
>>
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...
Posted by Keith Turner <ke...@deenlo.com>.
On Tue, May 21, 2013 at 11:54 AM, Corey Nolet <cj...@gmail.com> wrote:
> 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.
>
I suppose only the mini move commits fall in that range?
>
>
> On Tue, May 21, 2013 at 11:40 AM, Keith Turner <ke...@deenlo.com> wrote:
>
> > On Tue, May 21, 2013 at 11:37 AM, Corey Nolet <cj...@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 <cj...@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 <ke...@deenlo.com>
> > wrote:
> > > >
> > > >> On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@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, <cj...@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
> > > >> > >
> > > >> > >
> > > >> >
> > > >>
> > > >
> > > >
> > >
> >
>
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...
Posted by Corey Nolet <cj...@gmail.com>.
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 <ke...@deenlo.com> wrote:
> On Tue, May 21, 2013 at 11:37 AM, Corey Nolet <cj...@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 <cj...@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 <ke...@deenlo.com>
> wrote:
> > >
> > >> On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@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, <cj...@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
> > >> > >
> > >> > >
> > >> >
> > >>
> > >
> > >
> >
>
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...
Posted by Keith Turner <ke...@deenlo.com>.
On Tue, May 21, 2013 at 11:37 AM, Corey Nolet <cj...@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 <cj...@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 <ke...@deenlo.com> wrote:
> >
> >> On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@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, <cj...@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
> >> > >
> >> > >
> >> >
> >>
> >
> >
>
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...
Posted by Corey Nolet <cj...@gmail.com>.
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?
On Tue, May 21, 2013 at 11:19 AM, Corey Nolet <cj...@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 <ke...@deenlo.com> wrote:
>
>> On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@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, <cj...@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
>> > >
>> > >
>> >
>>
>
>
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...
Posted by Keith Turner <ke...@deenlo.com>.
On Tue, May 21, 2013 at 11:19 AM, Corey Nolet <cj...@gmail.com> wrote:
> I'd like to try it if you don't mind. The only way to learn is to do.
>
go for it
>
> 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 <ke...@deenlo.com> wrote:
>
> > On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@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, <cj...@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
> > > >
> > > >
> > >
> >
>
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...
Posted by Corey Nolet <cj...@gmail.com>.
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 <ke...@deenlo.com> wrote:
> On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@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, <cj...@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
> > >
> > >
> >
>
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...
Posted by Keith Turner <ke...@deenlo.com>.
On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@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, <cj...@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
> >
> >
>
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...
Posted by Keith Turner <ke...@deenlo.com>.
On Tue, May 21, 2013 at 12:09 PM, Corey Nolet <cj...@gmail.com> wrote:
> Keith: Correct. If you specify the revisions in reverse order, it reverses
> those commits.
>
> I'm comfortable with this change and ready to push up. Here's what I'll do:
>
> Revert changes in 1.4.4
> Revert changes in 1.5
> Revert changes in 1.6
> Merge 1.5 to 1.6
>
> Is this what you were describing above Keith?
>
slightly unrelated. We are trying to keep 1.5 and 1.6 in a state such
that "svn merge -r 1:HEAD 1.5 1.6" will work nicely. The point of this is
to ensure that bug fixes made in 1.5 are also made in 1.6.
>
>
> On Tue, May 21, 2013 at 12:03 PM, Christopher <ct...@apache.org> wrote:
>
> > git-svn is likely to do worse with preserving svn history.
> >
> > --
> > Christopher L Tubbs II
> > http://gravatar.com/ctubbsii
> >
> >
> > On Tue, May 21, 2013 at 11:05 AM, Vincent Russell
> > <vi...@gmail.com> wrote:
> > > Corey,
> > >
> > > You should try git-svn. That should give you an interface that you are
> > used to.
> > >
> > > On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@gmail.com>
> wrote:
> > >> Ill revert this and redo. Still getting used to svn.
> > >> 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, <cj...@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
> > >>>
> > >>>
> >
>
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...
Posted by Keith Turner <ke...@deenlo.com>.
On Tue, May 21, 2013 at 12:09 PM, Corey Nolet <cj...@gmail.com> wrote:
> Keith: Correct. If you specify the revisions in reverse order, it reverses
> those commits.
>
> I'm comfortable with this change and ready to push up. Here's what I'll do:
>
> Revert changes in 1.4.4
> Revert changes in 1.5
> Revert changes in 1.6
> Merge 1.5 to 1.6
>
> Is this what you were describing above Keith?
>
That is what I was thinking.
>
>
> On Tue, May 21, 2013 at 12:03 PM, Christopher <ct...@apache.org> wrote:
>
> > git-svn is likely to do worse with preserving svn history.
> >
> > --
> > Christopher L Tubbs II
> > http://gravatar.com/ctubbsii
> >
> >
> > On Tue, May 21, 2013 at 11:05 AM, Vincent Russell
> > <vi...@gmail.com> wrote:
> > > Corey,
> > >
> > > You should try git-svn. That should give you an interface that you are
> > used to.
> > >
> > > On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@gmail.com>
> wrote:
> > >> Ill revert this and redo. Still getting used to svn.
> > >> 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, <cj...@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
> > >>>
> > >>>
> >
>
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...
Posted by Corey Nolet <cj...@gmail.com>.
Keith: Correct. If you specify the revisions in reverse order, it reverses
those commits.
I'm comfortable with this change and ready to push up. Here's what I'll do:
Revert changes in 1.4.4
Revert changes in 1.5
Revert changes in 1.6
Merge 1.5 to 1.6
Is this what you were describing above Keith?
On Tue, May 21, 2013 at 12:03 PM, Christopher <ct...@apache.org> wrote:
> git-svn is likely to do worse with preserving svn history.
>
> --
> Christopher L Tubbs II
> http://gravatar.com/ctubbsii
>
>
> On Tue, May 21, 2013 at 11:05 AM, Vincent Russell
> <vi...@gmail.com> wrote:
> > Corey,
> >
> > You should try git-svn. That should give you an interface that you are
> used to.
> >
> > On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@gmail.com> wrote:
> >> Ill revert this and redo. Still getting used to svn.
> >> 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, <cj...@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
> >>>
> >>>
>
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...
Posted by Christopher <ct...@apache.org>.
git-svn is likely to do worse with preserving svn history.
--
Christopher L Tubbs II
http://gravatar.com/ctubbsii
On Tue, May 21, 2013 at 11:05 AM, Vincent Russell
<vi...@gmail.com> wrote:
> Corey,
>
> You should try git-svn. That should give you an interface that you are used to.
>
> On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@gmail.com> wrote:
>> Ill revert this and redo. Still getting used to svn.
>> 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, <cj...@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
>>>
>>>
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...
Posted by Vincent Russell <vi...@gmail.com>.
Corey,
You should try git-svn. That should give you an interface that you are used to.
On Tue, May 21, 2013 at 10:53 AM, Corey Nolet <cj...@gmail.com> wrote:
> Ill revert this and redo. Still getting used to svn.
> 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, <cj...@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
>>
>>
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...
Posted by Corey Nolet <cj...@gmail.com>.
Ill revert this and redo. Still getting used to svn.
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, <cj...@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
>
>