Grokbase Groups Lucene dev July 2011
FAQ
Yonik pointed out on #lucene-dev IRC <http://colabti.org/irclogger/irclogger_log/lucene-dev?date=2011-07-12#l356> 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/lucene/branches/solr2452" to transfer the SOLR-2452 changes to trunk. I had thought that this method would preserve trunk history better than other available options. I was wrong.

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 ; patch -p0 <../my.patch" cycles to keep up with concurrent development.

Here's how I'd like to fix the problem:

1. Backport to branch_3x by re-creating the SOLR-2452 changes as an svn movement script + patch (this is underway now), applying them, then committing. At this point, trunk and branch_3x will be in sync and devs can get back to normal backporting procedure. branch_3x won't suffer the same history problem as trunk.

2. Create a "newtrunk" branch (with solr2452 in the name somehow), copying from trunk at the revision just before SOLR-2452 was committed.

3. Convert all SOLR-2452 changes into a single svn movement script + patch, then apply them to "newtrunk" and commit. At this point, the structure and content of the "newtrunk" branch should be identical to trunk right after the SOLR-2452 commit, except for history-tracking svn properties.

4. Merge to "newtrunk" each commit applied to trunk since SOLR-2452 was committed to trunk, and commit each with the original log message.

5. svn rm trunk ; svn mv newtrunk trunk (with URLs, not WC paths)

The disadvantages I can think of to using the above approach: a) the post-2452 re-commits (#4 above) will be recorded as committed by me instead of the original committer; and b) the large amount of work required to make it happen (I think it will be worth it though - I'm a big fan of SVN history.)

The main advantage to this approach is that development can proceed normally. The only dev pain, AFAIK, will be the need to re-checkout after the process is complete.

Thoughts?

Steve

Search Discussions

  • Steven A Rowe at Jul 12, 2011 at 9:39 pm

    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 ; patch -p0 <../my.patch" cycles to keep
    up with concurrent development.
    I forgot to include the svn movement script - the full cycle is:

    svn diff >../my.patch
    svn --recursive revert .
    svn update
    ../my.svn.movement.script.sh
    patch -p0 <../my.patch
  • Robert Muir at Jul 12, 2011 at 9:41 pm

    On Tue, Jul 12, 2011 at 5:33 PM, Steven A Rowe wrote:
    Yonik pointed out on #lucene-dev IRC <http://colabti.org/irclogger/irclogger_log/lucene-dev?date=2011-07-12#l356> that SVN history for trunk/solr/ seems to be borked following my SOLR-2452 commit.
    I don't think this is true: history works for me normally.

    if i type 'svn log SolrCore.java' from
    solr/core/src/java/org/apache/solr/core, i see all revisions, going
    all the way back to
    ------------------------------------------------------------------------
    r372455 | yonik | 2006-01-26 00:37:29 -0500 (Thu, 26 Jan 2006) | 1 line

    initial version


    This also works automatically in my ide as well...

    --
    lucidimagination.com

    ---------------------------------------------------------------------
    To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
    For additional commands, e-mail: dev-help@lucene.apache.org
  • Steven A Rowe at Jul 12, 2011 at 10:14 pm

    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
    <http://colabti.org/irclogger/irclogger_log/lucene-dev?date=2011-07-12#l356>
    that SVN history for trunk/solr/ seems to be borked following my
    SOLR-2452 commit.
    I don't think this is true: history works for me normally.

    if i type 'svn log SolrCore.java' from
    solr/core/src/java/org/apache/solr/core, i see all revisions, going
    all the way back to
    ------------------------------------------------------------------------
    r372455 | yonik | 2006-01-26 00:37:29 -0500 (Thu, 26 Jan 2006) | 1 line

    initial version


    This also works automatically in my ide as well...

    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:

    =========
    ------------------------------------------------------------------------
    r1145198 | yonik | 2011-07-11 11:02:43 -0400 (Mon, 11 Jul 2011) | 1 line

    SOLR-2615: log individual updates at DEBUG level, fix NPE when no unique key
    ------------------------------------------------------------------------
    r1144761 | sarowe | 2011-07-09 19:01:53 -0400 (Sat, 09 Jul 2011) | 1 line

    SOLR-2452: Rewrote Solr build system (tighter integration with the Lucene build system) and restructured Solr internal and contrib modules
    ------------------------------------------------------------------------
    r1144174 | sarowe | 2011-07-08 02:41:23 -0400 (Fri, 08 Jul 2011) | 1 line

    SOLR-2452: merged with trunk up r1144161; applied the svn movement script and the latest version of the post-svn-movement patch
    ------------------------------------------------------------------------
    [snip: a bunch of merged-with-trunk log messages from me]
    ------------------------------------------------------------------------
    r1087601 | rmuir | 2011-04-01 02:54:34 -0400 (Fri, 01 Apr 2011) | 1 line

    create branch
    =========

    Whereas on trunk, the following commits occurred between r1087601 (solr2452 branch creation) and r1144761 (solr2452 branch reintegration into trunk) - these log messages are not represented on trunk anymore (I got them by checking out trunk at r1144760, just before reintegration):

    =========
    ------------------------------------------------------------------------
    r1141542 | markrmiller | 2011-06-30 09:59:59 -0400 (Thu, 30 Jun 2011) | 12 lines

    SOLR-2193, SOLR-2565: The default Solr update handler has been improved so
    that it uses fewer locks, keeps the IndexWriter open rather than closing it
    on each commit (ie commits no longer wait for background merges to complete),
    works with SolrCore to provide faster 'soft' commits, and has an improved API
    that requires less instanceof special casing.

    You may now specify a 'soft' commit when committing. This will
    use Lucene's NRT feature to avoid guaranteeing documents are on stable storage in exchange
    for faster reopen times. There is also a new 'soft' autocommit tracker that can be
    configured.

    SolrCores now properly share IndexWriters across SolrCore reloads.
    ------------------------------------------------------------------------
    r1138405 | shalin | 2011-06-22 07:18:43 -0400 (Wed, 22 Jun 2011) | 1 line

    SOLR-2610 -- Add an option to delete index through CoreAdmin UNLOAD action
    ------------------------------------------------------------------------
    r1133805 | simonw | 2011-06-09 07:43:35 -0400 (Thu, 09 Jun 2011) | 1 line

    Remove @Version tags from JavaDoc
    ------------------------------------------------------------------------
    r1127313 | rmuir | 2011-05-24 17:55:28 -0400 (Tue, 24 May 2011) | 1 line

    SOLR-1942: Ability to specify codec per field
    =========

    Steve
  • Robert Muir at Jul 12, 2011 at 10:34 pm

    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

    ---------------------------------------------------------------------
    To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
    For additional commands, e-mail: dev-help@lucene.apache.org
  • Robert Muir at Jul 12, 2011 at 10:42 pm
    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 - here are the most recent log entries for SolrCore.java:
    No, you just have to use svn log -g

    --
    lucidimagination.com


    --
    lucidimagination.com

    ---------------------------------------------------------------------
    To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
    For additional commands, e-mail: dev-help@lucene.apache.org
  • Steven A Rowe at Jul 12, 2011 at 11:07 pm
    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?

    Steve
    -----Original Message-----
    From: Robert Muir
    Sent: Tuesday, July 12, 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:
    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


    --
    lucidimagination.com

    ---------------------------------------------------------------------
    To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
    For additional commands, e-mail: dev-help@lucene.apache.org
  • Robert Muir at Jul 12, 2011 at 11:13 pm

    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.com

    ---------------------------------------------------------------------
    To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
    For additional commands, e-mail: dev-help@lucene.apache.org
  • Steven A Rowe at Jul 12, 2011 at 10:44 pm

    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 not know that.

    The "must de-bork history" impetus has vanished.

    Looks like the history breakage Yonik and I are seeing in IntelliJ and Github is a limitation of the tools...

    Steve
  • Robert Muir at Jul 12, 2011 at 10:48 pm

    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 SolrCore.java:
    No, you just have to use svn log -g
    I did not know that.

    The "must de-bork history" impetus has vanished.

    Looks like the history breakage Yonik and I are seeing in IntelliJ and Github is a limitation of the tools...
    well its not too funky, the only oddity is it looks like e.g. marks
    commit was done on your branch :)
    but really to see the fully history for stuff being merged from
    branches you have to look at this anyway, like if you want to see the
    history from the flex indexing branch or this or that.

    I don't have any objections with what you were proposing to make the
    history 'simpler', i just didn't want you to feel you had to go do a
    ton of effort for the problem... in general we seem to be using
    branches more and its important to look at the merged revisions too if
    you want to see all history.


    --
    lucidimagination.com

    ---------------------------------------------------------------------
    To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
    For additional commands, e-mail: dev-help@lucene.apache.org

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupdev @
categorieslucene
postedJul 12, '11 at 9:35p
activeJul 12, '11 at 11:13p
posts10
users2
websitelucene.apache.org

2 users in discussion

Robert Muir: 5 posts Steven A Rowe: 5 posts

People

Translate

site design / logo © 2021 Grokbase