Re: Merging from 1.4 to trunk

[Christopher Tubbs <ct...@gmail.com>]

I would say that it'd be nice if all changes in older branches were
also merged to newer branches... this keeps things linear, and helps
ensure no bug regressions (because all fixes in older versions can be
merged to newer versions, even if they don't apply). So, I would say
yes, the entire tree should be merged... for documentation purposes at
least. This means you might want to merge branch/src/core to
trunk/core, and then do a superficial merge (resolve conflicts, revert
changes, commit merge metadata only) from branch/ to trunk/ to ensure
the whole tree is documented as merged (assuming it was previously
fully merged before your changes).

On Sun, Sep 9, 2012 at 6:49 PM, Josh Elser <jo...@gmail.com> wrote:
> Right, I wasn't sure if there was guidance as to whether one should always
> make sure the entire tree is merged, or if merging of single changes is
> acceptable (assuming someone else will come by later and make sure dangling
> fixes aren't left in 1.4).
>
> On 09/09/2012 04:44 PM, Christopher Tubbs wrote:
>>
>> It seems to me that you can merge directly from branch/src/core to
>> trunk/core, or from branch/src/server to trunk/server. That, of
>> course, assumes you're only merging changes isolated to a single
>> submodule that was previously in src/
>>
>> On Sun, Sep 9, 2012 at 6:04 PM, Josh Elser<jo...@gmail.com>  wrote:
>>>
>>> Looking back at my dev@accumulo history, Billie gave some guidance on how
>>> to
>>> make subversion place nicely with the change from /src/$module to
>>> /$module
>>> between 1.4 and trunk. http://accumulo.apache.org/source.html says to
>>> consult dev@accumulo for instructions.
>>>
>>> Is Billie's guidance below still the best way to get around this?
>>> Manually
>>> resolving the conflicts every time seems like a pain, but if that's how
>>> it
>>> is, so be it.
>>>
>>> Thanks.
>>>
>>> -------- Original Message --------
>>> Subject:        Re: That extra 'src'
>>> Date:   Tue, 20 Mar 2012 17:22:39 +0000 (GMT+00:00)
>>> From:   Billie J Rinaldi<bi...@ugov.gov>
>>> Reply-To:       accumulo-dev@incubator.apache.org
>>> To:     accumulo-dev@incubator.apache.org
>>>
>>>
>>>
>>> I figured out a way to do this with two merges.  First, merge all
>>> revisions
>>> from 1.4 to trunk; then take the list of revisions merged and merge those
>>> from 1.4/src to trunk.
>>>
>>> $ svn merge -r 1:HEAD
>>> https://svn.apache.org/repos/asf/incubator/accumulo/branches/1.4 .
>>> --- Merging r1302469 through r1302913 into '.':
>>>     C src/examples
>>> Summary of conflicts:
>>>    Tree conflicts: 1
>>> $ svn merge -r 1302469:1302913
>>> https://svn.apache.org/repos/asf/incubator/accumulo/branches/1.4/src .
>>> --- Merging r1302470 through r1302913 into '.':
>>> U    examples/simple/pom.xml
>>> U
>>>
>>> examples/wikisearch/ingest/src/test/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaInputSplitTest.java
>>> U
>>>
>>> examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/output/SortingRFileOutputFormat.java
>>> U
>>>
>>> examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/output/BufferingRFileRecordWriter.java
>>> U
>>>
>>> examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaInputFormat.java
>>> U
>>>
>>> examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/LRUOutputCombiner.java
>>> U
>>>
>>> examples/wikisearch/ingest/src/main/java/org/apache/accumulo/examples/wikisearch/ingest/WikipediaMapper.java
>>> U    examples/wikisearch/README
>>>
>>> Now I just have to resolve the tree conflict.  Note that this works
>>> because
>>> we made a relatively simple change of removing a directory; if we had
>>> moved
>>> more things around, we would need to use more merge commands.
>>>
>>> Billie
>>>
>>>
>>> ----- Original Message -----
>>>>
>>>>   From: "Keith Turner"<ke...@deenlo.com>
>>>>   To: accumulo-dev@incubator.apache.org
>>>>   Sent: Thursday, March 15, 2012 11:09:36 AM
>>>>   Subject: Re: That extra 'src'
>>>>   On Mon, Mar 12, 2012 at 2:34 PM, Benson Margulies
>>>>   <bi...@gmail.com>   wrote:
>>>>   >   It doesn't really make merges work much harder, since the scm's
>>>>   >   track the moves.
>>>>
>>>>   Does anyone have tips on this? dist.xml was modified in 1.4. I am
>>>>   trying to merge 1.4 changes to trunk. dist.xml has moved in trunk.
>>>>
>>>>   $ svn merge -r 1:HEAD
>>>>   https://svn.apache.org/repos/asf/incubator/accumulo/branches/1.4
>>>>   --- Merging r1300182 through r1301010 into '.':
>>>>   C src/assemble
>>>>   Summary of conflicts:
>>>>   Tree conflicts: 1
>>>>   maccloud:trunk rkturn2$ svn status
>>>>   M .
>>>>   ! C src/assemble
>>>>   >     local delete, incoming edit upon merge
>>>>
>>>>   So I get this tree conflict. What I want it to do is to modify
>>>>   dist.xml in the new location in trunk, but its not doing this. I have
>>>>   been looking online but have not found anything yet.
>>>>
>>>>   Keith
>>>
>>>
>