[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Bug in svn merge --show-revs eligible ^/subversion/trunk ^/subversion/branches/1.6.x

From: Bert Huijben <bert_at_qqmail.nl>
Date: Thu, 25 Feb 2010 17:28:56 +0100

> -----Original Message-----
> From: Kamesh Jayachandran [mailto:kamesh_at_collab.net]
> Sent: donderdag 25 februari 2010 16:42
> To: dev_at_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
Received on 2010-02-25 17:29:35 CET

This is an archived mail posted to the Subversion Dev mailing list.