Re: SOLR-2452 svn history problems + proposed fix

2011-07-12 Thread Robert Muir
On Tue, Jul 12, 2011 at 7:05 PM, Steven A Rowe wrote: > Hmm, I can't find any equivalent setting in IntelliJ configuration. > > Does anyone else know how to enable "show merged revisions" in the IntelliJ > file History view? > http://youtrack.jetbrains.net/issue/IDEA-47679 -- lucidimagination.

RE: SOLR-2452 svn history problems + proposed fix

2011-07-12 Thread Steven A Rowe
, 2011 6:42 PM > To: dev@lucene.apache.org > Subject: Re: SOLR-2452 svn history problems + proposed fix > > also, on eclipse you just check 'show merged revisions' so your > history shows these things. > > On Tue, Jul 12, 2011 at 6:33 PM, Robert Muir wrote: &g

Re: SOLR-2452 svn history problems + proposed fix

2011-07-12 Thread Robert Muir
On Tue, Jul 12, 2011 at 6:42 PM, Steven A Rowe wrote: > On 7/12/2011 at 6:33 PM, Robert Muir wrote: >> On Tue, Jul 12, 2011 at 6:13 PM, Steven A Rowe wrote: >> > But the commits to trunk during the 2-month period of SOLR-2452 work >> > are obliterated - here are the most recent log entries for So

RE: SOLR-2452 svn history problems + proposed fix

2011-07-12 Thread Steven A Rowe
On 7/12/2011 at 6:33 PM, Robert Muir wrote: > On Tue, Jul 12, 2011 at 6:13 PM, Steven A Rowe wrote: > > But the commits to trunk during the 2-month period of SOLR-2452 work > > are obliterated - here are the most recent log entries for SolrCore.java: > > No, you just have to use svn log -g I did

Re: SOLR-2452 svn history problems + proposed fix

2011-07-12 Thread Robert Muir
also, on eclipse you just check 'show merged revisions' so your history shows these things. On Tue, Jul 12, 2011 at 6:33 PM, Robert Muir wrote: > On Tue, Jul 12, 2011 at 6:13 PM, Steven A Rowe wrote: > >> >> But the commits to trunk during the 2-month period of SOLR-2452 work are >> obliterated

Re: SOLR-2452 svn history problems + proposed fix

2011-07-12 Thread Robert Muir
On Tue, Jul 12, 2011 at 6:13 PM, Steven A Rowe wrote: > > But the commits to trunk during the 2-month period of SOLR-2452 work are > obliterated - here are the most recent log entries for SolrCore.java: > No, you just have to use svn log -g -- lucidimagination.com ---

RE: SOLR-2452 svn history problems + proposed fix

2011-07-12 Thread Steven A Rowe
On 7/12/2011 at 5:40 PM, Robert Muir wrote: > On Tue, Jul 12, 2011 at 5:33 PM, Steven A Rowe wrote: > > Yonik pointed out on #lucene-dev IRC > > > > that SVN history for trunk/solr/ seems to be borked following my > > SOL

Re: SOLR-2452 svn history problems + proposed fix

2011-07-12 Thread Robert Muir
On Tue, Jul 12, 2011 at 5:33 PM, Steven A Rowe wrote: > Yonik pointed out on #lucene-dev IRC > > that SVN history for trunk/solr/ seems to be borked following my SOLR-2452 > commit. > I don't think this is true: histo

RE: SOLR-2452 svn history problems + proposed fix

2011-07-12 Thread Steven A Rowe
On 7/12/2011 at 5:34 PM, Steven A Rowe wrote: > I now think that for mass restructuring, rather than a dedicated branch, > it's better to keep the changes as an svn movement script and a patch, > even though this requires regular "svn diff >../my.patch ; svn -- > recursive revert . ; svn update ; p

SOLR-2452 svn history problems + proposed fix

2011-07-12 Thread Steven A Rowe
Yonik pointed out on #lucene-dev IRC that SVN history for trunk/solr/ seems to be borked following my SOLR-2452 commit. AFAICT, I caused this problem by using "svn merge --reintegrate https://svn.apache.org/repos/asf/