subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeremy Greene <jer...@ZeeVee.Com>
Subject reintegrate fails due to "claimed" incomplete merge-out
Date Mon, 01 Sep 2014 16:37:37 GMT
(Not ont mailing list so please cc me)

I really have tried many many things to resolve this problem — endless searching, commits,
un-commits etc. But I’m stuck.

I think I see the issue(subdir merge of “…bitstream"), but have tried to do —record-only
merges, merges, propedits… all to no avail.

The information below is after an un-commit of all changes back to just after the last merge-out
from trunk to the branch (yellowstone).
Although, it’s hard to deal with the concept that after doing a merge out to the branch
that —reintegrate should fail!!!! That just seems wrong.

Any help on this would be immensely grateful — before this marathon of svn-ing, I didn’t
even know what mergeinfo was :) And I clearly still
don’t get something.

On trunk:
   jgreene@spi3:/home/jgreene/views/latest3$ svn merge --reintegrate ^/z4/branches/yellowstone
      svn: Reintegrate can only be used if revisions 27743 through 28342 were previously
           merged from svn://svn/z4/trunk 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 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 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             --
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





Mime
View raw message