Author: kameshj Date: Thu Feb 25 13:54:47 2010 New Revision: 916289 URL: http://svn.apache.org/viewvc?rev=916289&view=rev Log: * branches/1.6.x-r916286: New branch to merge r916286 to 1.6.x.
Added: subversion/branches/1.6.x-r916286/ (props changed) - copied from r916288, subversion/branches/1.6.x/ Propchange: subversion/branches/1.6.x-r916286/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Feb 25 13:54:47 2010 @@ -0,0 +1,2 @@ +[Ii]ssues?:?(\s*(,|and)?\s*#\d+)+ +(\d+) Propchange: subversion/branches/1.6.x-r916286/ ------------------------------------------------------------------------------ bugtraq:url = http://subversion.tigris.org/issues/show_bug.cgi?id=%BUGID% Propchange: subversion/branches/1.6.x-r916286/ ------------------------------------------------------------------------------ bzr:file-ids = Propchange: subversion/branches/1.6.x-r916286/ ------------------------------------------------------------------------------ --- bzr:revision-id-v3:trunk0 (added) +++ bzr:revision-id-v3:trunk0 Thu Feb 25 13:54:47 2010 @@ -0,0 +1 @@ +18228 jel...@samba.org-20070720143618-d1n3ric4vua52zpm Propchange: subversion/branches/1.6.x-r916286/ ------------------------------------------------------------------------------ --- bzr:revision-id:v3-trunk0 (added) +++ bzr:revision-id:v3-trunk0 Thu Feb 25 13:54:47 2010 @@ -0,0 +1,5 @@ +20214 jel...@samba.org-20071206202757-xopl18j270rt83ve +20235 jel...@samba.org-20071209150938-eavv3u65qqwjjkzy +20236 jel...@samba.org-20071209172359-x679msv2p5e5a4px +20244 jel...@samba.org-20071209215808-36ku3dm56r11230a +20248 jel...@samba.org-20071210031219-74vd608op3jvp2qe Propchange: subversion/branches/1.6.x-r916286/ ------------------------------------------------------------------------------ --- bzr:revision-info (added) +++ bzr:revision-info Thu Feb 25 13:54:47 2010 @@ -0,0 +1,5 @@ +timestamp: 2007-12-10 04:12:19.174999952 +0100 +committer: Jelmer Vernooij <jel...@samba.org> +properties: + branch-nick: trunk + rebase-of: jel...@samba.org-20071210031219-kupghow41xajbh2k Propchange: subversion/branches/1.6.x-r916286/ ------------------------------------------------------------------------------ subclipse:tags = 32486,trunk,/trunk,branch Propchange: subversion/branches/1.6.x-r916286/ ------------------------------------------------------------------------------ --- svk:merge (added) +++ svk:merge Thu Feb 25 13:54:47 2010 @@ -0,0 +1,21 @@ +40bec6f9-eef0-0310-8400-9b45a50af7ca:/local/trunk:90 +422c9f7f-73e9-0310-916f-f579f4d99a6a:/local/pool-cleanup:1951 +5fb2e21a-203d-0410-8290-957dc927bc9b:/local/trunk:31028 +834019e9-2104-4f97-81ba-933cb999031a:/svn/BOS-NJ:153289 +834019e9-2104-4f97-81ba-933cb999031a:/svn/BOS-NJ-tmp:153288 +834019e9-2104-4f97-81ba-933cb999031a:/svn/BOS-PHL:108970 +834019e9-2104-4f97-81ba-933cb999031a:/svn/SEA-BOS:108721 +834019e9-2104-4f97-81ba-933cb999031a:/svn/dav-to-neon:151584 +834019e9-2104-4f97-81ba-933cb999031a:/svn/propedit-urls:103714 +834019e9-2104-4f97-81ba-933cb999031a:/svn/props-in-subr:102459 +834019e9-2104-4f97-81ba-933cb999031a:/svn/repos-replay-bug:111919 +834019e9-2104-4f97-81ba-933cb999031a:/svn/repos-replay-textdelta:108713 +834019e9-2104-4f97-81ba-933cb999031a:/svn/rev-lock-real:113336 +834019e9-2104-4f97-81ba-933cb999031a:/svn/rev-lock-scratch:113335 +834019e9-2104-4f97-81ba-933cb999031a:/svn/test-chdir:148259 +834019e9-2104-4f97-81ba-933cb999031a:/svn/trunk:108720 +a3a164fe-643b-4d12-8ca0-1e5124d1c943:/svn/JFK-SFO:28628 +a3a164fe-643b-4d12-8ca0-1e5124d1c943:/svn/NBR-PHL:28509 +a3a164fe-643b-4d12-8ca0-1e5124d1c943:/svn/node-origins-bus:28431 +ae6c956b-9dc6-0310-97b2-e73af4192982:/svn/local:8265 +c9b7866f-f5e4-0310-b3ee-a2e1643c603f:/svn/local/new-auto-merge:10428 Propchange: subversion/branches/1.6.x-r916286/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu Feb 25 13:54:47 2010 @@ -0,0 +1,44 @@ +ChangeLog* +Makefile +config.cache +config.log +config.nice +config.status +configure +libtool +.gdb_history +*.orig +*.rej +TAGS +tags +neon +build-outputs.mk +autogen-standalone.mk +autom4te.cache +gen-make.opts +tests.log +db4-win32 +db +*.o +*~ +.*~ +apr +apr-util +apr-iconv +Release +Debug +subversion_msvc.dsw +subversion_msvc.ncb +subversion_msvc.opt +subversion_msvc.plg +subversion_vcnet.sln +subversion_vcnet.ncb +subversion_vcnet.suo +mkmf.log +.project +.classpath +.cdtproject +.settings +.cproject +zlib +sqlite-amalgamation Propchange: subversion/branches/1.6.x-r916286/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Feb 25 13:54:47 2010 @@ -0,0 +1,58 @@ +/subversion/branches/1.5.x-r30215:866657 +/subversion/branches/1.6.x-1.6.8-serfassertion:900822-900868 +/subversion/branches/1.6.x-UNC-paths:872816-872890 +/subversion/branches/1.6.x-dirent-basename:872475-872607 +/subversion/branches/1.6.x-future-proof:880259-884209 +/subversion/branches/1.6.x-issue3443:874942-875825 +/subversion/branches/1.6.x-issue3519:880376-889934 +/subversion/branches/1.6.x-no-svn_uri:872705-872760 +/subversion/branches/1.6.x-r36178:874221-874229 +/subversion/branches/1.6.x-r36252:872673-873133 +/subversion/branches/1.6.x-r37622:874044-874338 +/subversion/branches/1.6.x-r37627:874049-874273 +/subversion/branches/1.6.x-r37857:874277-874281 +/subversion/branches/1.6.x-r37953:876154-876416 +/subversion/branches/1.6.x-r37988:874408-875242 +/subversion/branches/1.6.x-r38000:875428-876112 +/subversion/branches/1.6.x-r38222:874644-875236 +/subversion/branches/1.6.x-r38572:875006-875011 +/subversion/branches/1.6.x-r38799:875225-875262 +/subversion/branches/1.6.x-r38927:875347-875521 +/subversion/branches/1.6.x-r39019:879132-895676 +/subversion/branches/1.6.x-r39109:879131 +/subversion/branches/1.6.x-r39557:876013-876252 +/subversion/branches/1.6.x-r39887:876369-876411 +/subversion/branches/1.6.x-r40452:880530-890996 +/subversion/branches/1.6.x-r889840:889888-890974 +/subversion/branches/1.6.x-r896522:896528-897866 +/subversion/branches/1.6.x-r898963:899874-915098 +/subversion/branches/bdb-reverse-deltas:868395-868874 +/subversion/branches/diff-callbacks3:866404-867106 +/subversion/branches/dont-save-plaintext-passwords-by-default:867073-867463 +/subversion/branches/double-delete:866856-869315 +/subversion/branches/file-externals:868124-869647 +/subversion/branches/fs-rep-sharing:865381-870148 +/subversion/branches/fsfs-pack:870062-870920 +/subversion/branches/gnome-keyring:866903-867755 +/subversion/branches/http-protocol-v2:875632 +/subversion/branches/in-memory-cache:866174-867797 +/subversion/branches/issue-2843-dev:867777-870524 +/subversion/branches/issue-3000:868058,868061-868064,868066-868071,868073,868079 +/subversion/branches/issue-3067-deleted-subtrees:869720-870429 +/subversion/branches/issue-3148-dev:871538-871549 +/subversion/branches/issue-3220-dev:868555-868571 +/subversion/branches/issue-3334-dirs:871501-872212 +/subversion/branches/kwallet:867130-867659 +/subversion/branches/log-g-performance:867286-867377 +/subversion/branches/merge-skips-obstructions:870870-870960 +/subversion/branches/reintegrate-improvements:870198-870509 +/subversion/branches/svn-mergeinfo-enhancements:866464-866540,866542-866633 +/subversion/branches/svnpatch-diff:868250,868331 +/subversion/branches/svnserve-logging:866173-867238 +/subversion/branches/tc-issue-3334:871042-871118 +/subversion/branches/tc-merge-notify:870362-870407 +/subversion/branches/tc-resolve:870536-870584 +/subversion/branches/tc_url_rev:870696-870828 +/subversion/branches/tree-conflicts:864636-869499 +/subversion/branches/tree-conflicts-notify:870271-870353 +/subversion/trunk:875976,875980-875981,876054-876056,876092,876175,876299,876306,876427,876440,876450,876507,876571,879093,879688,880274-880275,880370,880450,880474,880525-880526,881905,884842,886164,886197,888715,888979,889081,889840,895514,895653,896522,898963,899826,899828,900797 Propchange: subversion/branches/1.6.x-r916286/ ------------------------------------------------------------------------------ tsvn:logwidthmarker = 78