Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 01A4E1159C for ; Thu, 4 Sep 2014 05:24:39 +0000 (UTC) Received: (qmail 14794 invoked by uid 500); 4 Sep 2014 05:24:33 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 14760 invoked by uid 500); 4 Sep 2014 05:24:33 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Delivered-To: moderator for users@subversion.apache.org Received: (qmail 91129 invoked by uid 99); 1 Sep 2014 16:38:06 -0000 X-ASF-Spam-Status: No, hits=2.2 required=5.0 tests=HTML_MESSAGE,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of jeremy@zeevee.com designates 71.174.98.116 as permitted sender) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; s=s1024;d=zeevee.com; h=from:to:cc:subject:date:message-id:content-type:mime-version; bh=RacptZRj8tjmzjVahnfCEvSMzWI=; b=I4PEkMX/MP02ipL4Diu6qx3thHJE1qbFY56yW57MMg9a37dkwe18ViwQLTyAOwPhv7fD7Uix zidS/1PLZm2faxSwqYywOzeaiF+5uVm7IGo7d3Ao1xqte/8KK/b89MopfzQPR477HoMWKA9o 47+lHsXm+kPIbohCJq2+zWdB+OI= DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024;d=zeevee.com; h=from:to:cc:subject:date:message-id:content-type:mime-version; b=x6Q/wwCFH2tcCAAkIAVcaSxwflIxal6/CABqL7PDxn7AgkWGmGUmLNzbwv0txozkyCabddDw Z43slnLcxvUOSkEl7+v2QVaXnW7lmFScvRDDb6twowrARezCMRQx+rYIG5+6YT0wKVyuZdoE XkIAd6pKQGoGwyJGGsO3BdtxzOs= From: Jeremy Greene To: "users@subversion.apache.org" CC: Jeremy Greene Subject: reintegrate fails due to "claimed" incomplete merge-out Thread-Topic: reintegrate fails due to "claimed" incomplete merge-out Thread-Index: AQHPxgMK6lMURLP4S0aJsteUDzK9sg== Date: Mon, 1 Sep 2014 16:37:37 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Microsoft-MacOutlook/14.4.2.140509 x-originating-ip: [172.16.3.254] Content-Type: multipart/alternative; boundary="_000_D02A190E2D262jeremyzeeveecom_" MIME-Version: 1.0 X-Virus-Checked: Checked by ClamAV on apache.org --_000_D02A190E2D262jeremyzeeveecom_ Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable (Not ont mailing list so please cc me) I really have tried many many things to resolve this problem =97 endless se= arching, commits, un-commits etc. But I=92m stuck. I think I see the issue(subdir merge of =93=85bitstream"), but have tried t= o do =97record-only merges, merges, propedits=85 all to no avail. The information below is after an un-commit of all changes back to just aft= er the last merge-out from trunk to the branch (yellowstone). Although, it=92s hard to deal with the concept that after doing a merge out= to the branch that =97reintegrate should fail!!!! That just seems wrong. Any help on this would be immensely grateful =97 before this marathon of sv= n-ing, I didn=92t even know what mergeinfo was :) And I clearly still don=92t get something. On trunk: jgreene@spi3:/home/jgreene/views/latest3$ svn merge --reintegrate ^/z4/b= ranches/yellowstone svn: Reintegrate can only be used if revisions 27743 through 28342 we= re previously merged from svn://svn/z4/trunk to the reintegrate source, but th= is is not the case: z4/branches/yellowstone Missing ranges: /z4/trunk:27879-28339 jgreene@spi3:/home/jgreene/views/latest3$ Below is the output from "svn pg svn:mergeingo -R ." at the root of the bra= nch "yellowstone" workspace. All of the merge info records go from 27743 (branch start) to 28341 EXCEPT: z4/trunk/third_party/bitstream/mpeg:27938-28341 z4/trunk/third_party/bitstream/atsc:27938-28341 z4/trunk/third_party/bitstream:27879-28040*,28041-28341 z4/trunk/third_party/bitstream/dvb:27938-28341 z4/trunk/third_party/bitstream/common.h:27938-28341 z4/trunk/third_party/bitstream/ietf:27938-28341 FULL mergeinfo output on yellowstone branch (relating to merges out from tr= unk): rapidev2_release - z4/trunk/rapidev2_release:24018,27743-28341 fw - z4/trunk/fw:24018,27743-28341 third_party/freetype - z4/trunk/third_party/freetype:24018,27743-28341 Makefile - z4/trunk/Makefile:24018,27743-28341 third_party/freeimage - z4/trunk/third_party/freeimage:24018,27743-28341 third_party/openssl/md5.h - z4/trunk/third_party/openssl/md5.h:24018,27743-28341 third_party/zlib - z4/trunk/third_party/zlib:24018,27743-28341 README - z4/trunk/README:24018,27743-28341 third_party/curl - z4/trunk/third_party/curl:24018,27743-28341 third_party/openssl/notes - z4/trunk/third_party/openssl/notes:24018,27743-28341 bsp/u-boot_sp2x - z4/trunk/bsp/u-boot_sp2x:24018,27743-28341 third_party/Makefile - z4/trunk/third_party/Makefile:24018,27743-28341 third_party/openssl/e_os2.h - z4/trunk/third_party/openssl/e_os2.h:24018,27743-28341 third_party/Makefile.curl - z4/trunk/third_party/Makefile.curl:24018,27743-28341 third_party/bitstream/mpeg - z4/trunk/third_party/bitstream/mpeg:27938-28341 -- third_party/openssl - z4/trunk/third_party/openssl:24018,27743-27878,27879-28341* third_party/bitstream/atsc - z4/trunk/third_party/bitstream/atsc:27938-28341 -- fpga - z4/trunk/fpga:24018,27743-28341 . - z4/trunk:24018,27743-27878,27879-28341* bsp/kernel_sp2x - z4/trunk/bsp/kernel_sp2x:24018,27743-28341 third_party/openssl/libcrypto_linux.a - z4/trunk/third_party/openssl/libcrypto_linux.a:24018,27743-28341 third_party/bitstream - z4/trunk/third_party/bitstream:27879-28040*,28041-28341 -- third_party/openssl/libcrypto_win32.a - z4/trunk/third_party/openssl/libcrypto_win32.a:24018,27743-28341 bsp - z4/trunk/bsp:24018,27743-27878,27879-28341* third_party/sha1 - z4/trunk/third_party/sha1:24018,27743-28341 third_party - z4/trunk/third_party:24018,27743-27878,27879-28341* third_party/openssl/opensslconf.h - z4/trunk/third_party/openssl/opensslconf.h:24018,27743-28341 rapidev2_dyn_src - z4/trunk/rapidev2_dyn_src:24018,27743-28341 third_party/bitstream/dvb - z4/trunk/third_party/bitstream/dvb:27938-28341 -- build - z4/trunk/build:24018,27743-28341 rapidev2_pkgs - z4/trunk/rapidev2_pkgs:24018,27743-28341 third_party/bitstream/common.h - z4/trunk/third_party/bitstream/common.h:27938-28341 -- third_party/libupnp - z4/trunk/third_party/libupnp:24018,27743-28341 third_party/libpng - z4/trunk/third_party/libpng:24018,27743-28341 Makefile.HELP - z4/trunk/Makefile.HELP:24018,27743-28341 third_party/openssl/libcrypto_s1.a - z4/trunk/third_party/openssl/libcrypto_s1.a:24018,27743-28341 third_party/openssl/libcrypto_s2.a - z4/trunk/third_party/openssl/libcrypto_s2.a:24018,27743-28341 third_party/dhcp - z4/trunk/third_party/dhcp:24018,27743-28341 third_party/bitstream/ietf - z4/trunk/third_party/bitstream/ietf:27938-28341 -- third_party/mtd-utils - z4/trunk/third_party/mtd-utils:24018,27743-28341 --_000_D02A190E2D262jeremyzeeveecom_ Content-Type: text/html; charset="Windows-1252" Content-ID: Content-Transfer-Encoding: quoted-printable
(Not ont mailing list so please cc me)

I really have tried many many things to resolve this problem =97 endle= ss searching, commits, un-commits etc. But I=92m stuck.

I think I see the issue(subdir merge of =93=85bitstream"), but ha= ve tried to do =97record-only merges, merges, propedits=85 all to no avail.=  

The information below is after an un-commit of all changes back to jus= t after the last merge-out from trunk to the branch (yellowstone).
Although, it=92s hard to deal with the concept that after doing a merg= e out to the branch that =97reintegrate should fail!!!! That just seems wro= ng.

Any help on this would be immensely grateful =97 before this marathon = of svn-ing, I didn=92t even know what mergeinfo was :) And I clearly still<= /div>
don=92t get something.

On trunk: 
   jgreene@spi3:/home/jgreene/views/latest3$ svn merge --rei= ntegrate ^/z4/branches/yellowstone
      svn: Reintegrate can only be used if revisions 27= 743 through 28342 were previously 
           merged from svn://svn/z4/trun= k to the reintegrate source, but this is not the case:
                    = z4/branches/yellowstone
    Missing ranges: /z4/trunk:27879-28339

jgreene@spi3:/home/jgreene/views/latest3$ 

Below is the output from "svn pg svn:mergeingo -R ." at the = root of the branch "yellowstone" workspace. 
All of the merge info records go from 27743 (branch start) to 28341 EX= CEPT:
    z4/trunk/third_party/bitstream/mpeg:27938-28341   &= nbsp;         
    z4/trunk/third_party/bitstream/atsc:27938-28341   &= nbsp;         
    z4/trunk/third_party/bitstream:27879-28040*,28041-28341 =     
    z4/trunk/third_party/bitstream/dvb:27938-28341   &n= bsp;          
    z4/trunk/third_party/bitstream/common.h:27938-28341 &nbs= p;      
    z4/trunk/third_party/bitstream/ietf:27938-28341   &= nbsp;       

FULL mergeinfo output on yellowstone branch (relating to merges out fr= om trunk):

rapidev2_release - 
    z4/trunk/rapidev2_release:24018,27743-28341
fw - 
    z4/trunk/fw:24018,27743-28341
third_party/freetype - 
    z4/trunk/third_party/freetype:24018,27743-28341
Makefile - 
    z4/trunk/Makefile:24018,27743-28341
third_party/freeimage - 
    z4/trunk/third_party/freeimage:24018,27743-28341
third_party/openssl/md5.h - 
    z4/trunk/third_party/openssl/md5.h:24018,27743-28341
third_party/zlib - 
    z4/trunk/third_party/zlib:24018,27743-28341
README - 
    z4/trunk/README:24018,27743-28341
third_party/curl - 
    z4/trunk/third_party/curl:24018,27743-28341
third_party/openssl/notes - 
    z4/trunk/third_party/openssl/notes:24018,27743-28341
bsp/u-boot_sp2x - 
    z4/trunk/bsp/u-boot_sp2x:24018,27743-28341
third_party/Makefile - 
    z4/trunk/third_party/Makefile:24018,27743-28341
third_party/openssl/e_os2.h - 
    z4/trunk/third_party/openssl/e_os2.h:24018,27743-28341
third_party/Makefile.curl - 
    z4/trunk/third_party/Makefile.curl:24018,27743-28341
third_party/bitstream/mpeg - 
    z4/trunk/third_party/bitstream/mpeg:27938-28341   &= nbsp;         --
third_party/openssl - 
    z4/trunk/third_party/openssl:24018,27743-27878,27879-283= 41*
third_party/bitstream/atsc -  
    z4/trunk/third_party/bitstream/atsc:27938-28341   &= nbsp;         --
fpga - 
    z4/trunk/fpga:24018,27743-28341
. - 
    z4/trunk:24018,27743-27878,27879-28341*
bsp/kernel_sp2x - 
    z4/trunk/bsp/kernel_sp2x:24018,27743-28341
third_party/openssl/libcrypto_linux.a - 
    z4/trunk/third_party/openssl/libcrypto_linux.a:24018,277= 43-28341
third_party/bitstream -  
   z4/trunk/third_party/bitstream:27879-28040*,28041-28341 &= nbsp;    --
third_party/openssl/libcrypto_win32.a - 
    z4/trunk/third_party/openssl/libcrypto_win32.a:24018,277= 43-28341
bsp - 
    z4/trunk/bsp:24018,27743-27878,27879-28341*
third_party/sha1 - 
    z4/trunk/third_party/sha1:24018,27743-28341
third_party - 
    z4/trunk/third_party:24018,27743-27878,27879-28341*
third_party/openssl/opensslconf.h - 
    z4/trunk/third_party/openssl/opensslconf.h:24018,27743-2= 8341
rapidev2_dyn_src - 
    z4/trunk/rapidev2_dyn_src:24018,27743-28341
third_party/bitstream/dvb -  
    z4/trunk/third_party/bitstream/dvb:27938-28341   &n= bsp;          -- 
build - 
    z4/trunk/build:24018,27743-28341
rapidev2_pkgs - 
    z4/trunk/rapidev2_pkgs:24018,27743-28341
third_party/bitstream/common.h -  
    z4/trunk/third_party/bitstream/common.h:27938-28341 &nbs= p;       --
third_party/libupnp - 
    z4/trunk/third_party/libupnp:24018,27743-28341
third_party/libpng - 
    z4/trunk/third_party/libpng:24018,27743-28341
Makefile.HELP - 
    z4/trunk/Makefile.HELP:24018,27743-28341
third_party/openssl/libcrypto_s1.a - 
    z4/trunk/third_party/openssl/libcrypto_s1.a:24018,27743-= 28341
third_party/openssl/libcrypto_s2.a - 
    z4/trunk/third_party/openssl/libcrypto_s2.a:24018,27743-= 28341
third_party/dhcp - 
    z4/trunk/third_party/dhcp:24018,27743-28341
third_party/bitstream/ietf -  
   z4/trunk/third_party/bitstream/ietf:27938-28341   &n= bsp;  --
third_party/mtd-utils - 
    z4/trunk/third_party/mtd-utils:24018,27743-28341




--_000_D02A190E2D262jeremyzeeveecom_--