You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Kamesh Jayachandran <ka...@collab.net> on 2010/02/25 15:42:12 UTC
Bug in svn merge --show-revs eligible ^/subversion/trunk ^/subversion/branches/1.6.x
svn mergeinfo --show-revs eligible
https://svn.apache.org/repos/asf/subversion/trunk
https://svn.apache.org/repos/asf/subversion/branches/1.6.x
Above command lists 'r876233' while that has already been merged!
With regards
Kamesh Jayachandran
Re: Bug in svn merge --show-revs eligible ^/subversion/trunk
^/subversion/branches/1.6.x
Posted by Paul Burba <pt...@gmail.com>.
On Fri, Feb 26, 2010 at 1:07 PM, Paul Burba <pt...@gmail.com> wrote:
> On Thu, Feb 25, 2010 at 6:13 PM, Stefan Sperling <st...@elego.de> wrote:
>> On Thu, Feb 25, 2010 at 03:52:25PM -0500, Paul Burba wrote:
>>> Stefan, do you recall, or can you make an educated guess as to what
>>> client version you used to make the 1.6.x-r40452 branch in r880530?
>>
>> Must have been a trunk build from around that timeframe.
>>
>>> Did you remember how you made the branch? URL-to-URL copy I'm
>>> assuming?
>>
>> I've always been doing URL-to-URL copies to create branches, yes.
>>
>> Stefan
>
> When comparing mergeinfo for '/subversion/trunk' between
> ^/subversion/branches/1.6.x@880529 and
> ^/subversion/branches/1.6.x-r40452@880530 it's interesting to note
> that there are exactly the same number of revisions (273) even though
> they *all* differ. The ranges on the 1.6.x-r40452 branch were from
> 3655 to 3910 revisions higher than those on 1.6.x. It's probably not
> a coincidence that 3644 is the number of revisions in the old CVS
> repository that hosted Subversion development prior to the project
> becoming self-hosting. Mike converted this history with cvs2svn and
> combined it with our s.t.o. history and the whole thing got loaded to
> s.a.o -- see http://svn.apache.org/repos/asf/subversion/README. This
> in turn is likely related to the busted mergeinfo offsets we found
> during 1.6.7 testing,
> http://svn.haxx.se/dev/archive-2009-12/0386.shtml (which is still an
> open item for me).
>
> I still can't replicate anything like this, but I'm syncing a mirror
> of s.a.o. right now and will use it to more exactly replicate what
> Stefan did...
Grrrr...I should have realized this earlier, but the problem is *not*
with Stefan's copy, but rather with the load of our repos into the ASF
repos. Using an old mirror of the the s.t.o. repos shows that the
Stefan's copy was created with no changes to the mergeinfo...
C:\SVN\MIRRORS>svn log
file:///C:/SVN/MIRRORS/S.T.O.MIRROR/branches/1.6.x-r40452@40456
-r40456 -v
------------------------------------------------------------------------
r40456 | stsp | 2009-11-11 10:59:49 -0500 (Wed, 11 Nov 2009) | 2 lines
Changed paths:
A /branches/1.6.x-r40452 (from /branches/1.6.x:40455)
Create a brackport branch for r40452 and friends.
------------------------------------------------------------------------
C:\SVN\MIRRORS>svn diff
file:///C:/SVN/MIRRORS/S.T.O.MIRROR/branches/1.6.x-r40452@40456
-r40455:40456
C:\SVN\MIRRORS>
...but looking at the corresponding revision in the ASF repos, we see
the unexpected mergeinfo changes I mentioned earlier in this thread:
C:\SVN\MIRRORS>svn log -v
https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r40452@880530
-r880530
------------------------------------------------------------------------
r880530 | stsp | 2009-11-11 10:59:49 -0500 (Wed, 11 Nov 2009) | 2 lines
Changed paths:
A /subversion/branches/1.6.x-r40452 (from /subversion/branches/1.6.x:880529)
Create a brackport branch for r40452 and friends.
------------------------------------------------------------------------
C:\SVN\MIRRORS>svn diff
https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r40452@880530
-r880529:880530
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Reverse-merged subversion/branches/issue-3148-dev:r875193-875204
Reverse-merged subversion/branches/log-g-performance:r870941-871032
Reverse-merged subversion/branches/tc_url_rev:r874351-874483
Reverse-merged subversion/branches/1.6.x-no-svn_uri:r876360-876415
Reverse-merged
subversion/branches/issue-3000:r871713,871716-871719,871721-871726,871728,871734
Reverse-merged subversion/branches/diff-callbacks3:r870059-870761
Reverse-merged subversion/branches/double-delete:r870511-872970
Reverse-merged subversion/branches/gnome-keyring:r870558-871410
Reverse-merged subversion/branches/1.6.x-r36252:r876328-876788
Reverse-merged subversion/branches/fsfs-pack:r873717-874575
Reverse-merged subversion/branches/1.6.x-r37622:r877699-877993
Reverse-merged subversion/branches/1.6.x-issue3443:r878597-879480
Reverse-merged
subversion/trunk:r875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876059,876083,876091,876097,876101,87610
9,876123-876125,876129,876132,876138,876160,876167,876180,876185,876205,876223-876225,876230,876233,876252,876256,876283,876287,876312,876326-876327,876330,8763
66,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,876
614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,87
6857-876858,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877028-877029,877038,877119,877127,877146,877157,8
77191,877195,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568,
877573,877593,877601,877612,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,877869
,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,87809
1,878093,878095,878127,878129,878131,878142,878173-878176,878240,878242,878255,878272,878279,878296-878297,878303,878335,878338,878353,878364,878367-878368,8783
85,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,878
915,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879105,879126,879148,879170,879198-879199,879201,87
9271,879293,879357,879375-879376,879403,879631,879635-879636,879709-879711,879747,879954,879961,880082,880095,880105,880162,880226
Reverse-merged subversion/branches/tree-conflicts:r869500-873154
Reverse-merged subversion/branches/merge-skips-obstructions:r874525-874615
Reverse-merged subversion/branches/1.6.x-r38572:r878661-878666
Reverse-merged subversion/branches/1.6.x-r37627:r877704-877928
Reverse-merged subversion/branches/file-externals:r871779-873302
Reverse-merged subversion/branches/1.6.x-r36178:r877876-877884
Reverse-merged subversion/branches/tc-resolve:r874191-874239
Reverse-merged
subversion/branches/dont-save-plaintext-passwords-by-default:r870728-871118
Reverse-merged subversion/branches/tc-issue-3334:r874697-874773
Reverse-merged subversion/branches/tree-conflicts-notify:r873926-874008
Reverse-merged subversion/branches/svnpatch-diff:r871905,871986
Reverse-merged subversion/branches/1.6.x-r37988:r878063-878897
Reverse-merged subversion/branches/1.6.x-r39887:r880024-880066
Reverse-merged subversion/branches/1.6.x-r38799:r878880-878917
Reverse-merged subversion/branches/svnserve-logging:r869828-870893
Reverse-merged subversion/branches/reintegrate-improvements:r873853-874164
Reverse-merged subversion/branches/issue-2843-dev:r871432-874179
Reverse-merged subversion/branches/kwallet:r870785-871314
Reverse-merged subversion/branches/1.5.x-r30215:r870312
Reverse-merged subversion/branches/1.6.x-r38000:r879083-879767
Reverse-merged subversion/branches/1.6.x-dirent-basename:r876130-876262
Reverse-merged subversion/branches/tc-merge-notify:r874017-874062
Reverse-merged subversion/branches/bdb-reverse-deltas:r872050-872529
Reverse-merged subversion/branches/1.6.x-UNC-paths:r876471-876545
Reverse-merged subversion/branches/1.6.x-r38222:r878299-878891
Reverse-merged subversion/branches/in-memory-cache:r869829-871452
Reverse-merged subversion/branches/issue-3334-dirs:r875156-875867
Reverse-merged subversion/branches/issue-3067-deleted-subtrees:r873375-874084
Reverse-merged subversion/branches/1.6.x-r37953:r879809-880071
Reverse-merged subversion/branches/fs-rep-sharing:r870149-873803
Reverse-merged
subversion/branches/svn-mergeinfo-enhancements:r870119-870195,870197-870288
Reverse-merged subversion/branches/1.6.x-r39557:r879668-879907
Reverse-merged subversion/branches/1.6.x-r38927:r879002-879176
Reverse-merged subversion/branches/1.6.x-r37857:r877932-877936
Reverse-merged subversion/branches/issue-3220-dev:r872210-872226
Merged subversion/branches/issue-3148-dev:r871538-871549
Merged subversion/branches/log-g-performance:r867286-867377
Merged subversion/branches/tc_url_rev:r870696-870828
Merged subversion/branches/1.6.x-no-svn_uri:r872705-872760
Merged subversion/branches/issue-3000:r868058,868061-868064,868066-868071,868073,868079
Merged subversion/branches/diff-callbacks3:r866404-867106
Merged subversion/branches/double-delete:r866856-869315
Merged subversion/branches/gnome-keyring:r866903-867755
Merged subversion/branches/1.6.x-r36252:r872673-873133
Merged subversion/branches/fsfs-pack:r870062-870920
Merged subversion/branches/1.6.x-r37622:r874044-874338
Merged subversion/branches/1.6.x-issue3443:r874942-875825
Merged subversion/trunk:r872310,872313,872349,872357,872362,872364,872367,872369,872386-872387,872393,872396,872400-872401,872404,872428,872436,872442,872446
,872454,872468-872470,872474,872477,872483,872505,872512,872525,872530,872550,872568-872570,872575,872578,872597,872601,872628,872632,872657,872671-872672,87267
5,872711,872717,872719,872721,872728,872731,872787,872801-872802,872807-872809,872812,872814,872825,872831,872840-872842,872861-872863,872869,872871,872928,8729
46,872959,872973,872978,872986,873004,873032,873034,873050,873060,873071,873105,873108,873139,873149,873160-873161,873166,873170,873182,873185-873186,873188,873
194,873202-873203,873218,873235,873242,873250,873253,873270,873276,873279,873293-873294,873298,873332,873338,873356,873373-873374,873383,873464,873472,873491,87
3502,873536,873540,873556,873575,873579,873582,873588,873594,873604,873606,873649,873664,873752,873782,873786-873787,873798,873804,873817,873889,873898,873910,8
73913,873918,873938,873946,873957,874012,874026,874037,874041,874046,874065,874075,874129,874138,874142,874154,874160,874164,874166,874187,874193,874198,874212,
874214,874218,874246,874254,874261,874276,874287,874298,874309,874313,874315,874326-874327,874350,874358,874360,874365,874391,874398,874407,874419,874425,874434
,874436,874438,874440,874472,874474,874476,874487,874518-874521,874585,874587,874600,874617,874624,874641-874642,874648,874680,874683,874698,874709,874712-87471
3,874730,874807,874829,874836,874843,874877,874940,874991,875004,875018,875027-875028,875035-875036,875038,875068,875105-875106,875218,875220,875222,875224,8752
50,875260,875269-875270,875291,875294,875300,875305,875315,875326,875346,875378,875401,875419,875421,875426-875427,875450,875471,875493,875515,875543-875544,875
546,875616,875638,875702,875720-875721,875748,875976,875980-875981,876054,876092,876299,876306,876427,876440,876450,876507,876571
Merged subversion/branches/tree-conflicts:r864636-868290
Merged subversion/branches/merge-skips-obstructions:r870870-870960
Merged subversion/branches/1.6.x-r38572:r875006-875011
Merged subversion/branches/1.6.x-r37627:r874049-874273
Merged subversion/branches/file-externals:r868124-869647
Merged subversion/branches/1.6.x-r36178:r874221-874229
Merged subversion/branches/tc-resolve:r870536-870584
Merged subversion/branches/dont-save-plaintext-passwords-by-default:r867073-867463
Merged subversion/branches/tc-issue-3334:r871042-871118
Merged subversion/branches/tree-conflicts-notify:r870271-870353
Merged subversion/branches/svnpatch-diff:r868250,868331
Merged subversion/branches/1.6.x-r37988:r874408-875242
Merged subversion/branches/1.6.x-r39887:r876369-876411
Merged subversion/branches/1.6.x-r38799:r875225-875262
Merged subversion/branches/svnserve-logging:r866173-867238
Merged subversion/branches/reintegrate-improvements:r870198-870509
Merged subversion/branches/issue-2843-dev:r867777-870524
Merged subversion/branches/kwallet:r867130-867659
Merged subversion/branches/1.5.x-r30215:r866657
Merged subversion/branches/1.6.x-r38000:r875428-876112
Merged subversion/branches/1.6.x-dirent-basename:r872475-872607
Merged subversion/branches/tc-merge-notify:r870362-870407
Merged subversion/branches/bdb-reverse-deltas:r868395-868874
Merged subversion/branches/1.6.x-UNC-paths:r872816-872890
Merged subversion/branches/1.6.x-r38222:r874644-875236
Merged subversion/branches/in-memory-cache:r866174-867797
Merged subversion/branches/issue-3334-dirs:r871501-872212
Merged subversion/branches/issue-3067-deleted-subtrees:r869720-870429
Merged subversion/branches/1.6.x-r37953:r876154-876416
Merged subversion/branches/fs-rep-sharing:r865381-869035
Merged subversion/branches/svn-mergeinfo-enhancements:r866464-866540,866542-866633
Merged subversion/branches/1.6.x-r39557:r876013-876252
Merged subversion/branches/1.6.x-r38927:r875347-875521
Merged subversion/branches/1.6.x-r37857:r874277-874281
Merged subversion/branches/issue-3220-dev:r868555-868571
So this is more of the same mangled offset problem discussed here
http://svn.haxx.se/dev/archive-2009-12/0382.shtml. That doesn't solve
$#!% but at least we know we are not dealing with some other bug.
Going back to the offset problem now, I'll follow up in a new thread.
Paul
Re: Bug in svn merge --show-revs eligible ^/subversion/trunk
^/subversion/branches/1.6.x
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Feb 25, 2010 at 6:13 PM, Stefan Sperling <st...@elego.de> wrote:
> On Thu, Feb 25, 2010 at 03:52:25PM -0500, Paul Burba wrote:
>> Stefan, do you recall, or can you make an educated guess as to what
>> client version you used to make the 1.6.x-r40452 branch in r880530?
>
> Must have been a trunk build from around that timeframe.
>
>> Did you remember how you made the branch? URL-to-URL copy I'm
>> assuming?
>
> I've always been doing URL-to-URL copies to create branches, yes.
>
> Stefan
When comparing mergeinfo for '/subversion/trunk' between
^/subversion/branches/1.6.x@880529 and
^/subversion/branches/1.6.x-r40452@880530 it's interesting to note
that there are exactly the same number of revisions (273) even though
they *all* differ. The ranges on the 1.6.x-r40452 branch were from
3655 to 3910 revisions higher than those on 1.6.x. It's probably not
a coincidence that 3644 is the number of revisions in the old CVS
repository that hosted Subversion development prior to the project
becoming self-hosting. Mike converted this history with cvs2svn and
combined it with our s.t.o. history and the whole thing got loaded to
s.a.o -- see http://svn.apache.org/repos/asf/subversion/README. This
in turn is likely related to the busted mergeinfo offsets we found
during 1.6.7 testing,
http://svn.haxx.se/dev/archive-2009-12/0386.shtml (which is still an
open item for me).
I still can't replicate anything like this, but I'm syncing a mirror
of s.a.o. right now and will use it to more exactly replicate what
Stefan did...
Paul
Re: Bug in svn merge --show-revs eligible ^/subversion/trunk
^/subversion/branches/1.6.x
Posted by Stefan Sperling <st...@elego.de>.
On Thu, Feb 25, 2010 at 03:52:25PM -0500, Paul Burba wrote:
> Stefan, do you recall, or can you make an educated guess as to what
> client version you used to make the 1.6.x-r40452 branch in r880530?
Must have been a trunk build from around that timeframe.
> Did you remember how you made the branch? URL-to-URL copy I'm
> assuming?
I've always been doing URL-to-URL copies to create branches, yes.
Stefan
Re: Bug in svn merge --show-revs eligible ^/subversion/trunk
^/subversion/branches/1.6.x
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Feb 25, 2010 at 1:23 PM, Paul Burba <pt...@gmail.com> wrote:
> On Thu, Feb 25, 2010 at 10:42 AM, Kamesh Jayachandran <ka...@collab.net> wrote:
>
>> svn mergeinfo --show-revs eligible
>> https://svn.apache.org/repos/asf/subversion/trunk
>> https://svn.apache.org/repos/asf/subversion/branches/1.6.x
>>
>> Above command lists 'r876233' while that has already been merged!
>>
>> With regards
>> Kamesh Jayachandran
>
> As Bert pointed out, the mergeinfo on the 1.6.x branch got pretty well
> hosed in r891009 (not 3891009 :-)
>
> C:\SVN\src-branch-1.6.x>svn log -r891009
> https://svn.apache.org/repos/asf/subversion/branches/1.6.x
> ------------------------------------------------------------------------
> r891009 | hwright | 2009-12-15 16:45:45 -0500 (Tue, 15 Dec 2009) | 15 lines
>
> Manually merge the 1.6.x-r40452 branch back to 1.6.x:
>
> * r880525, r880526
> Fix 'svn resolve --accept=theirs-conflict' for targets which live inside
> a subdirectory of the current working directory.
> Justification:
> 'svn resolve --accept=theirs-conflict' cannot be used reliably.
> Notes:
> A backport branch is at ^/subversion/branches/1.6.x-r40452.
> 1.6.x has an additional bug which does not occur on trunk, requiring
> additional fixes exclusive to 1.6.x. See the log message of r880532
> (which shows what the bug is), and see r880533 (which fixes the bug).
> Votes:
> +1: stsp, pburba, cmpilato
>
> ------------------------------------------------------------------------
>
>
> Hyrum did this "manual merge" because the reintegrate merge of
> 1.6.x-r40452 wouldn't work:
>
> Dec 16 09:03:22 <pburba> hwright: pong (from yesterday)
> Dec 16 09:04:03 <hwright> pburba: I was having a difficulty
> reintegrating a branch to 1.6.x, and ended up doing it manually
> Dec 16 09:04:18 <pburba> hwright: Which one?
> Dec 16 09:04:52 <pburba> nm, I see the log
> Dec 16 09:04:53 <hwright> The most recent merge to the branch (1.6.x-r40xxx)
> Dec 16 09:05:19 <hwright> I don't know if it was a user error or a
> mergeinfo migration error or something else
> Dec 16 09:05:34 <hwright> but since I eventually got the merge done, I
> don't care *too* much now :P
> Dec 16 09:06:12 <pburba> But *I* care :-)
> Dec 16 09:06:20 <hwright> heh. I'm glad
> Dec 16 09:09:48 <pburba> hwright: Works with 1.6.x for me, you were
> using a trunk client?
> Dec 16 09:09:58 <hwright> nope
> Dec 16 09:10:21 <pburba> Do you recall exactly what went wrong?
> Dec 16 09:10:43 <hwright> the error I was getting was something along
> the lines of "<some mystical URL> doesn't exist"
> Dec 16 09:11:06 <hwright> with the mystical URL being one of the
> webdav urls with revision and path in it
> Dec 16 09:11:29 <hwright> my guess is that it couldn't find the branch
> in a specific revision, and that the problem was relating to
> mergeinfo...or something
> Dec 16 09:18:45 <pburba> I voted on that branch Monday and had
> reintegrated it without problem then too. Hmmmm. You using ra_neon
> or ra_serf?
> Dec 16 09:20:02 <hwright> neon
> Dec 16 09:20:13 <hwright> (that's the ra method du jure for me)
> Dec 16 09:24:20 <pburba> Ah ha, I see the error with neon!
> Dec 16 09:24:36 <pburba> svn:
> '/repos/asf/!svn/bc/875961/subversion/branches/1.6.x' path not found
> Dec 16 09:24:48 <hwright> exactly
> Dec 16 09:25:06 <hwright> In all honesty, I didn't even think to try serf
> Dec 16 09:25:26 <pburba> I wouldn't have either. It's usually the
> other way around.
> Dec 16 09:25:58 <pburba> Honestly I was taking a complete shot in the
> dark on the ra layer...got my lucky guess allotment for the month
> Dec 16 09:27:42 * pburba notes the x86-macosx-gnu shared buildbot
> tested 1.6.x@891009 with ra_neon without issue
> Dec 16 09:28:25 <hwright> sure, the code that was merged was good
> Dec 16 09:28:35 <hwright> it was just *doing* the merge that was troublesome
> Dec 16 09:29:17 <pburba> I meant that the test suite isn't picking up
> on this problem in the merge tests
> Dec 16 09:30:08 * hwright listens to the cacophony of children crying
> in the other room
> Dec 16 09:30:22 <pburba> Would have been nice for a simple
> reproduction in the test suite to fail is all
> Dec 16 09:30:29 <hwright> sure
> Dec 16 09:30:45 <pburba> anyway, looking into it right now
>
> The merge didn't work due to an intersection of several problems:
>
> Discussion of busted merge:
> http://subversion.tigris.org/issues/show_bug.cgi?id=3547
> Issue #3547: http://svn.haxx.se/dev/archive-2009-12/0338.shtml
> Self-referential mergeinfo mystery:
> http://svn.haxx.se/dev/archive-2009-12/0337.shtml
>
> Anyhow, why he did a manual merge are not important as what caused the
> breakage is either fixed or nominated for backport (see * r892050,
> 892085 in STATUS - which only needs one more vote).
>
> The manual merge itself isn't a problem either, rather the problem is
> that when stsp created the branch in r880530, all the mergeinfo
> changed:
>
> C:\SVN>svn diff --depth empty
> https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r40452@880530
> -r880529:880530
>
> Property changes on: .
> ___________________________________________________________________
> Modified: svn:mergeinfo
> Reverse-merged /subversion/branches/in-memory-cache:r869829-871452
> Reverse-merged /subversion/branches/1.6.x-r37622:r877699-877993
> Reverse-merged
> /subversion/trunk:r875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876059,876083,876091,876097,876101,8761
> 09,876123-876125,876129,876132,876138,876160,876167,876180,876185,876205,876223-876225,876230,876233,876252,876256,876283,876287,876312,876326-876327,876330,876
> 366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,87
> 6614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,8
> 76857-876858,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877028-877029,877038,877119,877127,877146,877157,
> 877191,877195,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568
> ,877573,877593,877601,877612,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,87786
> 9,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,8780
> 91,878093,878095,878127,878129,878131,878142,878173-878176,878240,878242,878255,878272,878279,878296-878297,878303,878335,878338,878353,878364,878367-878368,878
> 385,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,87
> 8915,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879105,879126,879148,879170,879198-879199,879201,8
> 79271,879293,879357,879375-879376,879403,879631,879635-879636,879709-879711,879747,879954,879961,880082,880095,880105,880162,880226
> Reverse-merged /subversion/branches/issue-3334-dirs:r875156-875867
> Reverse-merged /subversion/branches/tree-conflicts:r869500-873154
> Reverse-merged /subversion/branches/file-externals:r871779-873302
> Reverse-merged /subversion/branches/1.6.x-r36178:r877876-877884
> Reverse-merged /subversion/branches/1.6.x-r37627:r877704-877928
> Reverse-merged /subversion/branches/1.6.x-r38572:r878661-878666
> Reverse-merged /subversion/branches/merge-skips-obstructions:r874525-874615
> Reverse-merged
> /subversion/branches/issue-3067-deleted-subtrees:r873375-874084
> Reverse-merged
> /subversion/branches/dont-save-plaintext-passwords-by-default:r870728-871118
> Reverse-merged /subversion/branches/tc-resolve:r874191-874239
> Reverse-merged /subversion/branches/1.6.x-r39887:r880024-880066
> Reverse-merged /subversion/branches/1.6.x-r37988:r878063-878897
> Reverse-merged /subversion/branches/1.6.x-r38799:r878880-878917
> Reverse-merged /subversion/branches/svnserve-logging:r869828-870893
> Reverse-merged /subversion/branches/reintegrate-improvements:r873853-874164
> Reverse-merged /subversion/branches/issue-2843-dev:r871432-874179
> Reverse-merged /subversion/branches/1.5.x-r30215:r870312
> Reverse-merged /subversion/branches/log-g-performance:r870941-871032
> Reverse-merged /subversion/branches/1.6.x-r38000:r879083-879767
> Reverse-merged /subversion/branches/diff-callbacks3:r870059-870761
> Reverse-merged /subversion/branches/1.6.x-r38222:r878299-878891
> Reverse-merged /subversion/branches/bdb-reverse-deltas:r872050-872529
> Reverse-merged /subversion/branches/double-delete:r870511-872970
> Reverse-merged /subversion/branches/gnome-keyring:r870558-871410
> Reverse-merged /subversion/branches/fsfs-pack:r873717-874575
> Reverse-merged /subversion/branches/1.6.x-issue3443:r878597-879480
> Reverse-merged /subversion/branches/1.6.x-r37953:r879809-880071
> Reverse-merged
> /subversion/branches/svn-mergeinfo-enhancements:r870119-870195,870197-870288
> Reverse-merged /subversion/branches/fs-rep-sharing:r870149-873803
> Reverse-merged /subversion/branches/1.6.x-r39557:r879668-879907
> Reverse-merged /subversion/branches/1.6.x-r38927:r879002-879176
> Reverse-merged /subversion/branches/tc-issue-3334:r874697-874773
> Reverse-merged /subversion/branches/1.6.x-r37857:r877932-877936
> Reverse-merged /subversion/branches/tree-conflicts-notify:r873926-874008
> Reverse-merged /subversion/branches/issue-3220-dev:r872210-872226
> Reverse-merged /subversion/branches/svnpatch-diff:r871905,871986
> Reverse-merged /subversion/branches/issue-3148-dev:r875193-875204
> Reverse-merged /subversion/branches/kwallet:r870785-871314
> Reverse-merged /subversion/branches/tc_url_rev:r874351-874483
> Reverse-merged /subversion/branches/1.6.x-dirent-basename:r876130-876262
> Reverse-merged /subversion/branches/1.6.x-no-svn_uri:r876360-876415
> Reverse-merged
> /subversion/branches/issue-3000:r871713,871716-871719,871721-871726,871728,871734
> Reverse-merged /subversion/branches/tc-merge-notify:r874017-874062
> Reverse-merged /subversion/branches/1.6.x-UNC-paths:r876471-876545
> Reverse-merged /subversion/branches/1.6.x-r36252:r876328-876788
> Merged /subversion/branches/in-memory-cache:r866174-867797
> Merged /subversion/branches/1.6.x-r37622:r874044-874338
> Merged /subversion/trunk:r872310,872313,872349,872357,872362,872364,872367,872369,872386-872387,872393,872396,872400-872401,872404,872428,872436,872442,87244
> 6,872454,872468-872470,872474,872477,872483,872505,872512,872525,872530,872550,872568-872570,872575,872578,872597,872601,872628,872632,872657,872671-872672,8726
> 75,872711,872717,872719,872721,872728,872731,872787,872801-872802,872807-872809,872812,872814,872825,872831,872840-872842,872861-872863,872869,872871,872928,872
> 946,872959,872973,872978,872986,873004,873032,873034,873050,873060,873071,873105,873108,873139,873149,873160-873161,873166,873170,873182,873185-873186,873188,87
> 3194,873202-873203,873218,873235,873242,873250,873253,873270,873276,873279,873293-873294,873298,873332,873338,873356,873373-873374,873383,873464,873472,873491,8
> 73502,873536,873540,873556,873575,873579,873582,873588,873594,873604,873606,873649,873664,873752,873782,873786-873787,873798,873804,873817,873889,873898,873910,
> 873913,873918,873938,873946,873957,874012,874026,874037,874041,874046,874065,874075,874129,874138,874142,874154,874160,874164,874166,874187,874193,874198,874212
> ,874214,874218,874246,874254,874261,874276,874287,874298,874309,874313,874315,874326-874327,874350,874358,874360,874365,874391,874398,874407,874419,874425,87443
> 4,874436,874438,874440,874472,874474,874476,874487,874518-874521,874585,874587,874600,874617,874624,874641-874642,874648,874680,874683,874698,874709,874712-8747
> 13,874730,874807,874829,874836,874843,874877,874940,874991,875004,875018,875027-875028,875035-875036,875038,875068,875105-875106,875218,875220,875222,875224,875
> 250,875260,875269-875270,875291,875294,875300,875305,875315,875326,875346,875378,875401,875419,875421,875426-875427,875450,875471,875493,875515,875543-875544,87
> 5546,875616,875638,875702,875720-875721,875748,875976,875980-875981,876054,876092,876299,876306,876427,876440,876450,876507,876571
> Merged /subversion/branches/issue-3334-dirs:r871501-872212
> Merged /subversion/branches/tree-conflicts:r864636-868290
> Merged /subversion/branches/file-externals:r868124-869647
> Merged /subversion/branches/1.6.x-r36178:r874221-874229
> Merged /subversion/branches/1.6.x-r37627:r874049-874273
> Merged /subversion/branches/1.6.x-r38572:r875006-875011
> Merged /subversion/branches/merge-skips-obstructions:r870870-870960
> Merged /subversion/branches/issue-3067-deleted-subtrees:r869720-870429
> Merged /subversion/branches/dont-save-plaintext-passwords-by-default:r867073-867463
> Merged /subversion/branches/tc-resolve:r870536-870584
> Merged /subversion/branches/1.6.x-r39887:r876369-876411
> Merged /subversion/branches/1.6.x-r37988:r874408-875242
> Merged /subversion/branches/1.6.x-r38799:r875225-875262
> Merged /subversion/branches/svnserve-logging:r866173-867238
> Merged /subversion/branches/reintegrate-improvements:r870198-870509
> Merged /subversion/branches/issue-2843-dev:r867777-870524
> Merged /subversion/branches/1.5.x-r30215:r866657
> Merged /subversion/branches/log-g-performance:r867286-867377
> Merged /subversion/branches/1.6.x-r38000:r875428-876112
> Merged /subversion/branches/diff-callbacks3:r866404-867106
> Merged /subversion/branches/1.6.x-r38222:r874644-875236
> Merged /subversion/branches/bdb-reverse-deltas:r868395-868874
> Merged /subversion/branches/double-delete:r866856-869315
> Merged /subversion/branches/gnome-keyring:r866903-867755
> Merged /subversion/branches/fsfs-pack:r870062-870920
> Merged /subversion/branches/1.6.x-issue3443:r874942-875825
> Merged /subversion/branches/1.6.x-r37953:r876154-876416
> Merged /subversion/branches/svn-mergeinfo-enhancements:r866464-866540,866542-866633
> Merged /subversion/branches/fs-rep-sharing:r865381-869035
> Merged /subversion/branches/1.6.x-r39557:r876013-876252
> Merged /subversion/branches/1.6.x-r38927:r875347-875521
> Merged /subversion/branches/tc-issue-3334:r871042-871118
> Merged /subversion/branches/1.6.x-r37857:r874277-874281
> Merged /subversion/branches/tree-conflicts-notify:r870271-870353
> Merged /subversion/branches/issue-3220-dev:r868555-868571
> Merged /subversion/branches/svnpatch-diff:r868250,868331
> Merged /subversion/branches/issue-3148-dev:r871538-871549
> Merged /subversion/branches/kwallet:r867130-867659
> Merged /subversion/branches/tc_url_rev:r870696-870828
> Merged /subversion/branches/1.6.x-dirent-basename:r872475-872607
> Merged /subversion/branches/1.6.x-no-svn_uri:r872705-872760
> Merged /subversion/branches/issue-3000:r868058,868061-868064,868066-868071,868073,868079
> Merged /subversion/branches/tc-merge-notify:r870362-870407
> Merged /subversion/branches/1.6.x-UNC-paths:r872816-872890
> Merged /subversion/branches/1.6.x-r36252:r872673-873133
>
> Looking into what the #%!@ went wrong here...
No luck replicating this.
Stefan, do you recall, or can you make an educated guess as to what
client version you used to make the 1.6.x-r40452 branch in r880530?
Did you remember how you made the branch? URL-to-URL copy I'm
assuming?
Paul
Re: Bug in svn merge --show-revs eligible ^/subversion/trunk
^/subversion/branches/1.6.x
Posted by Paul Burba <pt...@gmail.com>.
On Thu, Feb 25, 2010 at 10:42 AM, Kamesh Jayachandran <ka...@collab.net> wrote:
> svn mergeinfo --show-revs eligible
> https://svn.apache.org/repos/asf/subversion/trunk
> https://svn.apache.org/repos/asf/subversion/branches/1.6.x
>
> Above command lists 'r876233' while that has already been merged!
>
> With regards
> Kamesh Jayachandran
As Bert pointed out, the mergeinfo on the 1.6.x branch got pretty well
hosed in r891009 (not 3891009 :-)
C:\SVN\src-branch-1.6.x>svn log -r891009
https://svn.apache.org/repos/asf/subversion/branches/1.6.x
------------------------------------------------------------------------
r891009 | hwright | 2009-12-15 16:45:45 -0500 (Tue, 15 Dec 2009) | 15 lines
Manually merge the 1.6.x-r40452 branch back to 1.6.x:
* r880525, r880526
Fix 'svn resolve --accept=theirs-conflict' for targets which live inside
a subdirectory of the current working directory.
Justification:
'svn resolve --accept=theirs-conflict' cannot be used reliably.
Notes:
A backport branch is at ^/subversion/branches/1.6.x-r40452.
1.6.x has an additional bug which does not occur on trunk, requiring
additional fixes exclusive to 1.6.x. See the log message of r880532
(which shows what the bug is), and see r880533 (which fixes the bug).
Votes:
+1: stsp, pburba, cmpilato
------------------------------------------------------------------------
Hyrum did this "manual merge" because the reintegrate merge of
1.6.x-r40452 wouldn't work:
Dec 16 09:03:22 <pburba> hwright: pong (from yesterday)
Dec 16 09:04:03 <hwright> pburba: I was having a difficulty
reintegrating a branch to 1.6.x, and ended up doing it manually
Dec 16 09:04:18 <pburba> hwright: Which one?
Dec 16 09:04:52 <pburba> nm, I see the log
Dec 16 09:04:53 <hwright> The most recent merge to the branch (1.6.x-r40xxx)
Dec 16 09:05:19 <hwright> I don't know if it was a user error or a
mergeinfo migration error or something else
Dec 16 09:05:34 <hwright> but since I eventually got the merge done, I
don't care *too* much now :P
Dec 16 09:06:12 <pburba> But *I* care :-)
Dec 16 09:06:20 <hwright> heh. I'm glad
Dec 16 09:09:48 <pburba> hwright: Works with 1.6.x for me, you were
using a trunk client?
Dec 16 09:09:58 <hwright> nope
Dec 16 09:10:21 <pburba> Do you recall exactly what went wrong?
Dec 16 09:10:43 <hwright> the error I was getting was something along
the lines of "<some mystical URL> doesn't exist"
Dec 16 09:11:06 <hwright> with the mystical URL being one of the
webdav urls with revision and path in it
Dec 16 09:11:29 <hwright> my guess is that it couldn't find the branch
in a specific revision, and that the problem was relating to
mergeinfo...or something
Dec 16 09:18:45 <pburba> I voted on that branch Monday and had
reintegrated it without problem then too. Hmmmm. You using ra_neon
or ra_serf?
Dec 16 09:20:02 <hwright> neon
Dec 16 09:20:13 <hwright> (that's the ra method du jure for me)
Dec 16 09:24:20 <pburba> Ah ha, I see the error with neon!
Dec 16 09:24:36 <pburba> svn:
'/repos/asf/!svn/bc/875961/subversion/branches/1.6.x' path not found
Dec 16 09:24:48 <hwright> exactly
Dec 16 09:25:06 <hwright> In all honesty, I didn't even think to try serf
Dec 16 09:25:26 <pburba> I wouldn't have either. It's usually the
other way around.
Dec 16 09:25:58 <pburba> Honestly I was taking a complete shot in the
dark on the ra layer...got my lucky guess allotment for the month
Dec 16 09:27:42 * pburba notes the x86-macosx-gnu shared buildbot
tested 1.6.x@891009 with ra_neon without issue
Dec 16 09:28:25 <hwright> sure, the code that was merged was good
Dec 16 09:28:35 <hwright> it was just *doing* the merge that was troublesome
Dec 16 09:29:17 <pburba> I meant that the test suite isn't picking up
on this problem in the merge tests
Dec 16 09:30:08 * hwright listens to the cacophony of children crying
in the other room
Dec 16 09:30:22 <pburba> Would have been nice for a simple
reproduction in the test suite to fail is all
Dec 16 09:30:29 <hwright> sure
Dec 16 09:30:45 <pburba> anyway, looking into it right now
The merge didn't work due to an intersection of several problems:
Discussion of busted merge:
http://subversion.tigris.org/issues/show_bug.cgi?id=3547
Issue #3547: http://svn.haxx.se/dev/archive-2009-12/0338.shtml
Self-referential mergeinfo mystery:
http://svn.haxx.se/dev/archive-2009-12/0337.shtml
Anyhow, why he did a manual merge are not important as what caused the
breakage is either fixed or nominated for backport (see * r892050,
892085 in STATUS - which only needs one more vote).
The manual merge itself isn't a problem either, rather the problem is
that when stsp created the branch in r880530, all the mergeinfo
changed:
C:\SVN>svn diff --depth empty
https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r40452@880530
-r880529:880530
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Reverse-merged /subversion/branches/in-memory-cache:r869829-871452
Reverse-merged /subversion/branches/1.6.x-r37622:r877699-877993
Reverse-merged
/subversion/trunk:r875965,875968,876004,876012,876017,876019,876022,876024,876041-876042,876048,876051,876059,876083,876091,876097,876101,8761
09,876123-876125,876129,876132,876138,876160,876167,876180,876185,876205,876223-876225,876230,876233,876252,876256,876283,876287,876312,876326-876327,876330,876
366,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,876467,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876601,87
6614,876628,876633,876641,876659,876687,876689,876705,876715,876726,876760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,876843,876849,8
76857-876858,876873,876890,876897,876905,876908,876925,876931,876934,876948-876949,876953,876987,876993,877011,877028-877029,877038,877119,877127,877146,877157,
877191,877195,877211,877230,877234,877237,877243,877249,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,877472,877544,877553,877565,877568
,877573,877593,877601,877612,877667,877681,877692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,877821,877842,877848,877853,877867,87786
9,877873,877901,877909,877916,877931,877942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,878046,878053,878062,878074,878080,878089,8780
91,878093,878095,878127,878129,878131,878142,878173-878176,878240,878242,878255,878272,878279,878296-878297,878303,878335,878338,878353,878364,878367-878368,878
385,878462,878484,878491,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878693,878723,878760-878761,878873,878875,878877,878879,878905,87
8915,878924-878925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,879076,879081-879082,879105,879126,879148,879170,879198-879199,879201,8
79271,879293,879357,879375-879376,879403,879631,879635-879636,879709-879711,879747,879954,879961,880082,880095,880105,880162,880226
Reverse-merged /subversion/branches/issue-3334-dirs:r875156-875867
Reverse-merged /subversion/branches/tree-conflicts:r869500-873154
Reverse-merged /subversion/branches/file-externals:r871779-873302
Reverse-merged /subversion/branches/1.6.x-r36178:r877876-877884
Reverse-merged /subversion/branches/1.6.x-r37627:r877704-877928
Reverse-merged /subversion/branches/1.6.x-r38572:r878661-878666
Reverse-merged /subversion/branches/merge-skips-obstructions:r874525-874615
Reverse-merged
/subversion/branches/issue-3067-deleted-subtrees:r873375-874084
Reverse-merged
/subversion/branches/dont-save-plaintext-passwords-by-default:r870728-871118
Reverse-merged /subversion/branches/tc-resolve:r874191-874239
Reverse-merged /subversion/branches/1.6.x-r39887:r880024-880066
Reverse-merged /subversion/branches/1.6.x-r37988:r878063-878897
Reverse-merged /subversion/branches/1.6.x-r38799:r878880-878917
Reverse-merged /subversion/branches/svnserve-logging:r869828-870893
Reverse-merged /subversion/branches/reintegrate-improvements:r873853-874164
Reverse-merged /subversion/branches/issue-2843-dev:r871432-874179
Reverse-merged /subversion/branches/1.5.x-r30215:r870312
Reverse-merged /subversion/branches/log-g-performance:r870941-871032
Reverse-merged /subversion/branches/1.6.x-r38000:r879083-879767
Reverse-merged /subversion/branches/diff-callbacks3:r870059-870761
Reverse-merged /subversion/branches/1.6.x-r38222:r878299-878891
Reverse-merged /subversion/branches/bdb-reverse-deltas:r872050-872529
Reverse-merged /subversion/branches/double-delete:r870511-872970
Reverse-merged /subversion/branches/gnome-keyring:r870558-871410
Reverse-merged /subversion/branches/fsfs-pack:r873717-874575
Reverse-merged /subversion/branches/1.6.x-issue3443:r878597-879480
Reverse-merged /subversion/branches/1.6.x-r37953:r879809-880071
Reverse-merged
/subversion/branches/svn-mergeinfo-enhancements:r870119-870195,870197-870288
Reverse-merged /subversion/branches/fs-rep-sharing:r870149-873803
Reverse-merged /subversion/branches/1.6.x-r39557:r879668-879907
Reverse-merged /subversion/branches/1.6.x-r38927:r879002-879176
Reverse-merged /subversion/branches/tc-issue-3334:r874697-874773
Reverse-merged /subversion/branches/1.6.x-r37857:r877932-877936
Reverse-merged /subversion/branches/tree-conflicts-notify:r873926-874008
Reverse-merged /subversion/branches/issue-3220-dev:r872210-872226
Reverse-merged /subversion/branches/svnpatch-diff:r871905,871986
Reverse-merged /subversion/branches/issue-3148-dev:r875193-875204
Reverse-merged /subversion/branches/kwallet:r870785-871314
Reverse-merged /subversion/branches/tc_url_rev:r874351-874483
Reverse-merged /subversion/branches/1.6.x-dirent-basename:r876130-876262
Reverse-merged /subversion/branches/1.6.x-no-svn_uri:r876360-876415
Reverse-merged
/subversion/branches/issue-3000:r871713,871716-871719,871721-871726,871728,871734
Reverse-merged /subversion/branches/tc-merge-notify:r874017-874062
Reverse-merged /subversion/branches/1.6.x-UNC-paths:r876471-876545
Reverse-merged /subversion/branches/1.6.x-r36252:r876328-876788
Merged /subversion/branches/in-memory-cache:r866174-867797
Merged /subversion/branches/1.6.x-r37622:r874044-874338
Merged /subversion/trunk:r872310,872313,872349,872357,872362,872364,872367,872369,872386-872387,872393,872396,872400-872401,872404,872428,872436,872442,87244
6,872454,872468-872470,872474,872477,872483,872505,872512,872525,872530,872550,872568-872570,872575,872578,872597,872601,872628,872632,872657,872671-872672,8726
75,872711,872717,872719,872721,872728,872731,872787,872801-872802,872807-872809,872812,872814,872825,872831,872840-872842,872861-872863,872869,872871,872928,872
946,872959,872973,872978,872986,873004,873032,873034,873050,873060,873071,873105,873108,873139,873149,873160-873161,873166,873170,873182,873185-873186,873188,87
3194,873202-873203,873218,873235,873242,873250,873253,873270,873276,873279,873293-873294,873298,873332,873338,873356,873373-873374,873383,873464,873472,873491,8
73502,873536,873540,873556,873575,873579,873582,873588,873594,873604,873606,873649,873664,873752,873782,873786-873787,873798,873804,873817,873889,873898,873910,
873913,873918,873938,873946,873957,874012,874026,874037,874041,874046,874065,874075,874129,874138,874142,874154,874160,874164,874166,874187,874193,874198,874212
,874214,874218,874246,874254,874261,874276,874287,874298,874309,874313,874315,874326-874327,874350,874358,874360,874365,874391,874398,874407,874419,874425,87443
4,874436,874438,874440,874472,874474,874476,874487,874518-874521,874585,874587,874600,874617,874624,874641-874642,874648,874680,874683,874698,874709,874712-8747
13,874730,874807,874829,874836,874843,874877,874940,874991,875004,875018,875027-875028,875035-875036,875038,875068,875105-875106,875218,875220,875222,875224,875
250,875260,875269-875270,875291,875294,875300,875305,875315,875326,875346,875378,875401,875419,875421,875426-875427,875450,875471,875493,875515,875543-875544,87
5546,875616,875638,875702,875720-875721,875748,875976,875980-875981,876054,876092,876299,876306,876427,876440,876450,876507,876571
Merged /subversion/branches/issue-3334-dirs:r871501-872212
Merged /subversion/branches/tree-conflicts:r864636-868290
Merged /subversion/branches/file-externals:r868124-869647
Merged /subversion/branches/1.6.x-r36178:r874221-874229
Merged /subversion/branches/1.6.x-r37627:r874049-874273
Merged /subversion/branches/1.6.x-r38572:r875006-875011
Merged /subversion/branches/merge-skips-obstructions:r870870-870960
Merged /subversion/branches/issue-3067-deleted-subtrees:r869720-870429
Merged /subversion/branches/dont-save-plaintext-passwords-by-default:r867073-867463
Merged /subversion/branches/tc-resolve:r870536-870584
Merged /subversion/branches/1.6.x-r39887:r876369-876411
Merged /subversion/branches/1.6.x-r37988:r874408-875242
Merged /subversion/branches/1.6.x-r38799:r875225-875262
Merged /subversion/branches/svnserve-logging:r866173-867238
Merged /subversion/branches/reintegrate-improvements:r870198-870509
Merged /subversion/branches/issue-2843-dev:r867777-870524
Merged /subversion/branches/1.5.x-r30215:r866657
Merged /subversion/branches/log-g-performance:r867286-867377
Merged /subversion/branches/1.6.x-r38000:r875428-876112
Merged /subversion/branches/diff-callbacks3:r866404-867106
Merged /subversion/branches/1.6.x-r38222:r874644-875236
Merged /subversion/branches/bdb-reverse-deltas:r868395-868874
Merged /subversion/branches/double-delete:r866856-869315
Merged /subversion/branches/gnome-keyring:r866903-867755
Merged /subversion/branches/fsfs-pack:r870062-870920
Merged /subversion/branches/1.6.x-issue3443:r874942-875825
Merged /subversion/branches/1.6.x-r37953:r876154-876416
Merged /subversion/branches/svn-mergeinfo-enhancements:r866464-866540,866542-866633
Merged /subversion/branches/fs-rep-sharing:r865381-869035
Merged /subversion/branches/1.6.x-r39557:r876013-876252
Merged /subversion/branches/1.6.x-r38927:r875347-875521
Merged /subversion/branches/tc-issue-3334:r871042-871118
Merged /subversion/branches/1.6.x-r37857:r874277-874281
Merged /subversion/branches/tree-conflicts-notify:r870271-870353
Merged /subversion/branches/issue-3220-dev:r868555-868571
Merged /subversion/branches/svnpatch-diff:r868250,868331
Merged /subversion/branches/issue-3148-dev:r871538-871549
Merged /subversion/branches/kwallet:r867130-867659
Merged /subversion/branches/tc_url_rev:r870696-870828
Merged /subversion/branches/1.6.x-dirent-basename:r872475-872607
Merged /subversion/branches/1.6.x-no-svn_uri:r872705-872760
Merged /subversion/branches/issue-3000:r868058,868061-868064,868066-868071,868073,868079
Merged /subversion/branches/tc-merge-notify:r870362-870407
Merged /subversion/branches/1.6.x-UNC-paths:r872816-872890
Merged /subversion/branches/1.6.x-r36252:r872673-873133
Looking into what the #%!@ went wrong here...
Paul
RE: Bug in svn merge --show-revs eligible ^/subversion/trunk ^/subversion/branches/1.6.x
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Kamesh Jayachandran [mailto:kamesh@collab.net]
> Sent: donderdag 25 februari 2010 16:42
> To: dev@subversion.apache.org
> Subject: Bug in svn merge --show-revs eligible ^/subversion/trunk
> ^/subversion/branches/1.6.x
>
> svn mergeinfo --show-revs eligible
> https://svn.apache.org/repos/asf/subversion/trunk
> https://svn.apache.org/repos/asf/subversion/branches/1.6.x
>
> Above command lists 'r876233' while that has already been merged!
This revision was removed from the mergeinfo in r891009.
$ svn diff . -c 3891009
<snip>
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Reverse-merged /subversion/branches/in-memory-cache:r869829-871452
Reverse-merged /subversion/branches/1.6.x-r37622:r877699-877993
Reverse-merged
/subversion/trunk:r875965,875968,876004,876012,876017,876019,876022,876024,8
76041-876042,876048,876051,876059,876083,876091,876097,876101,876109,876123-
876125,876129,876132,876138,876160,876167,876180,876185,876205,876223-876225
,876230,876233,876252,876256,876283,876287,876312,876326-876327,876330,87636
6,876372,876374,876376,876383,876386,876442,876456-876457,876462-876464,8764
67,876469,876480,876486,876495-876497,876516-876518,876524,876526,876583,876
601,876614,876628,876633,876641,876659,876687,876689,876705,876715,876726,87
6760,876763,876794,876804,876815-876816,876821,876825,876837,876840-876841,8
76843,876849,876857-876858,876873,876890,876897,876905,876908,876925,876931,
876934,876948-876949,876953,876987,876993,877011,877028-877029,877038,877119
,877127,877146,877157,877191,877195,877211,877230,877234,877237,877243,87724
9,877259,877261,877304,877319,877407,877437,877441-877442,877453,877459,8774
72,877544,877553,877565,877568,877573,877593,877601,877612,877667,877681,877
692,877696,877701,877720,877730,877784,877793,877797,877809,877815,877819,87
7821,877842,877848,877853,877867,877869,877873,877901,877909,877916,877931,8
77942,877953,877964,877968,877970,877981-877982,878005,878013,878015,878020,
878046,878053,878062,878074,878080,878089,878091,878093,878095,878127,878129
,878131,878142,878173-878176,878240,878242,878255,878272,878279,878296-87829
7,878303,878335,878338,878353,878364,878367-878368,878385,878462,878484,8784
91,878498,878532,878595,878646,878659,878673,878682-878683,878690-878691,878
693,878723,878760-878761,878873,878875,878877,878879,878905,878915,878924-87
8925,878946,878949,878955,878960,878970,878981,879001,879033,879056,879074,8
79076,879081-879082,879105,879126,879148,879170,879198-879199,879201,879271,
879293,879357,879375-879376,879403,879631,879635-879636,879709-879711,879747
,879954,879961,880082,880095,880105,880162,880226
Reverse-merged /subversion/branches/issue-3334-dirs:r875156-875867
Reverse-merged /subversion/branches/tree-conflicts:r869500-873154
Reverse-merged /subversion/branches/file-externals:r871779-873302
Reverse-merged /subversion/branches/1.6.x-r38572:r878661-878666
Reverse-merged /subversion/branches/1.6.x-r36178:r877876-877884
Reverse-merged /subversion/branches/1.6.x-r37627:r877704-877928
Reverse-merged
/subversion/branches/merge-skips-obstructions:r874525-874615
Reverse-merged
/subversion/branches/dont-save-plaintext-passwords-by-default:r870728-871118
Reverse-merged
/subversion/branches/issue-3067-deleted-subtrees:r873375-874084
Reverse-merged /subversion/branches/tc-resolve:r874191-874239
Reverse-merged /subversion/branches/1.6.x-r39887:r880024-880066
Reverse-merged /subversion/branches/1.6.x-r37988:r878063-878897
Reverse-merged /subversion/branches/1.6.x-r38799:r878880-878917
Reverse-merged /subversion/branches/svnserve-logging:r869828-870893
Reverse-merged
/subversion/branches/reintegrate-improvements:r873853-874164
Reverse-merged /subversion/branches/issue-2843-dev:r871432-874179
Reverse-merged /subversion/branches/1.5.x-r30215:r870312
Reverse-merged /subversion/branches/log-g-performance:r870941-871032
Reverse-merged /subversion/branches/1.6.x-r38000:r879083-879767
Reverse-merged /subversion/branches/diff-callbacks3:r870059-870761
Reverse-merged /subversion/branches/1.6.x-r38222:r878299-878891
Reverse-merged /subversion/branches/bdb-reverse-deltas:r872050-872529
Reverse-merged /subversion/branches/double-delete:r870511-872970
Reverse-merged /subversion/branches/gnome-keyring:r870558-871410
Reverse-merged /subversion/branches/fsfs-pack:r873717-874575
Reverse-merged /subversion/branches/1.6.x-issue3443:r878597-879480
Reverse-merged /subversion/branches/1.6.x-r37953:r879809-880071
Reverse-merged
/subversion/branches/svn-mergeinfo-enhancements:r870119-870195,870197-870288
Reverse-merged /subversion/branches/fs-rep-sharing:r870149-873803
Reverse-merged /subversion/branches/1.6.x-r39557:r879668-879907
Reverse-merged /subversion/branches/1.6.x-r38927:r879002-879176
Reverse-merged /subversion/branches/tc-issue-3334:r874697-874773
Reverse-merged /subversion/branches/1.6.x-r37857:r877932-877936
Reverse-merged /subversion/branches/tree-conflicts-notify:r873926-874008
Reverse-merged /subversion/branches/issue-3220-dev:r872210-872226
Reverse-merged /subversion/branches/svnpatch-diff:r871905,871986
Reverse-merged /subversion/branches/issue-3148-dev:r875193-875204
Reverse-merged /subversion/branches/kwallet:r870785-871314
Reverse-merged /subversion/branches/tc_url_rev:r874351-874483
Reverse-merged /subversion/branches/1.6.x-dirent-basename:r876130-876262
Reverse-merged /subversion/branches/1.6.x-no-svn_uri:r876360-876415
Reverse-merged
/subversion/branches/issue-3000:r871713,871716-871719,871721-871726,871728,8
71734
Reverse-merged /subversion/branches/tc-merge-notify:r874017-874062
Reverse-merged /subversion/branches/1.6.x-UNC-paths:r876471-876545
Reverse-merged /subversion/branches/1.6.x-r36252:r876328-876788
Merged /subversion/branches/in-memory-cache:r866174-867797
Merged /subversion/branches/1.6.x-r37622:r874044-874338
Merged
/subversion/trunk:r875976,875980-875981,876054,876092,876299,876306,876427,8
76440,876450,876507,876571,880525-880526
Merged /subversion/branches/issue-3334-dirs:r871501-872212
Merged /subversion/branches/tree-conflicts:r864636-868290
Merged /subversion/branches/file-externals:r868124-869647
Merged /subversion/branches/1.6.x-r38572:r875006-875011
Merged /subversion/branches/1.6.x-r36178:r874221-874229
Merged /subversion/branches/1.6.x-r37627:r874049-874273
Merged /subversion/branches/merge-skips-obstructions:r870870-870960
Merged
/subversion/branches/dont-save-plaintext-passwords-by-default:r867073-867463
Merged /subversion/branches/issue-3067-deleted-subtrees:r869720-870429
Merged /subversion/branches/tc-resolve:r870536-870584
Merged /subversion/branches/1.6.x-r39887:r876369-876411
Merged /subversion/branches/1.6.x-r37988:r874408-875242
Merged /subversion/branches/1.6.x-r38799:r875225-875262
Merged /subversion/branches/svnserve-logging:r866173-867238
Merged /subversion/branches/reintegrate-improvements:r870198-870509
Merged /subversion/branches/issue-2843-dev:r867777-870524
Merged /subversion/branches/1.5.x-r30215:r866657
Merged /subversion/branches/log-g-performance:r867286-867377
Merged /subversion/branches/1.6.x-r38000:r875428-876112
Merged /subversion/branches/diff-callbacks3:r866404-867106
Merged /subversion/branches/1.6.x-r38222:r874644-875236
Merged /subversion/branches/bdb-reverse-deltas:r868395-868874
Merged /subversion/branches/double-delete:r866856-869315
Merged /subversion/branches/gnome-keyring:r866903-867755
Merged /subversion/branches/fsfs-pack:r870062-870920
Merged /subversion/branches/1.6.x-issue3443:r874942-875825
Merged /subversion/branches/1.6.x-r37953:r876154-876416
Merged
/subversion/branches/svn-mergeinfo-enhancements:r866464-866540,866542-866633
Merged /subversion/branches/fs-rep-sharing:r865381-869035
Merged /subversion/branches/1.6.x-r39557:r876013-876252
Merged /subversion/branches/1.6.x-r38927:r875347-875521
Merged /subversion/branches/tc-issue-3334:r871042-871118
Merged /subversion/branches/1.6.x-r37857:r874277-874281
Merged /subversion/branches/tree-conflicts-notify:r870271-870353
Merged /subversion/branches/issue-3220-dev:r868555-868571
Merged /subversion/branches/svnpatch-diff:r868250,868331
Merged /subversion/branches/issue-3148-dev:r871538-871549
Merged /subversion/branches/kwallet:r867130-867659
Merged /subversion/branches/tc_url_rev:r870696-870828
Merged /subversion/branches/1.6.x-dirent-basename:r872475-872607
Merged /subversion/branches/1.6.x-no-svn_uri:r872705-872760
Merged
/subversion/branches/issue-3000:r868058,868061-868064,868066-868071,868073,8
68079
Merged /subversion/branches/1.6.x-r40452:r880530-890996
Merged /subversion/branches/tc-merge-notify:r870362-870407
Merged /subversion/branches/1.6.x-UNC-paths:r872816-872890
Merged /subversion/branches/1.6.x-r36252:r872673-873133
If somebody can explain what exactly happened here?
Bert
>
> With regards
> Kamesh Jayachandran