In the transcript below, I run 'svn merge -r412:417', but Subversion
appears to merge only r413-r417. In other words, it seems to clip off
one revision: r412 gets bumped up to r413.
This was surprising, because r412 contained huge changes on the
branch, and in fact was the most important revision in the range being
merged. Immediately afterwards, I ran 'svn merge -c412', and sure
enough, Subversion pulled in the r412 changes that it had not pulled
in before.
I realize I could (and maybe should) have used --reintegrate. But
given that I didn't, I wonder why Subversion didn't just do what I
told it to.
I've included that transcript and a few others below. Each transcript
is separated by "=*= =*= =*= ...". The transcripts are:
1. The merges themselves.
2. The output of 'svn log -v', so you can see what was in the
revisions that were merged.
3. The mergeinfo properties on the tree, from before the merge
command (I used -rBASE, since I got this information while the
last merge was still running).
=*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*=
1. The merges, with some comments (search for "###").
=*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*=
### First, just so you know where we are:
$ svn info | grep URL
URL: http://svn.red-bean.com/repos/questioncopyright/trunk
### Okay, try the entire desired merge.
$ svn merge -r412:417 http://svn.red-bean.com/repos/questioncopyright/branches/qc_63 .
--- Merging r413 through r417 into '.':
A sites/default/default.settings.php
A sites/all/themes/questioncopyright/questioncopyright.info
A sites/all/modules/custom
A sites/all/modules/custom/commenttip
A sites/all/modules/custom/commenttip/commenttip.module
A sites/all/modules/custom/commenttip/jtooltips
A sites/all/modules/custom/commenttip/jtooltips/LICENSE.txt
A sites/all/modules/custom/commenttip/jtooltips/jtooltips.info
A sites/all/modules/custom/commenttip/jtooltips/sweettitles.css
A sites/all/modules/custom/commenttip/jtooltips/jtooltips.module
A sites/all/modules/custom/commenttip/jtooltips/js
A sites/all/modules/custom/commenttip/jtooltips/js/jquery.tooltip.pack.js
A sites/all/modules/custom/commenttip/jtooltips/jtooltips.install
A sites/all/modules/custom/commenttip/jtooltips/README
A sites/all/modules/custom/commenttip/jtooltips/jtooltips.css
A sites/all/modules/custom/commenttip/commenttip.info
A sites/all/modules/custom/commenttip/README.txt
D modules/legacy
### Here I did a quick 'st -v' on a file that should have been removed
### by the merge (see r412), but 'st -v' shows it's still in trunk:
$ svn st -v misc/maintenance.css
418 154 kfogel misc/maintenance.css
### Strange. Okay, let's merge r412 explicitly:
$ svn merge -c412 http://svn.red-bean.com/repos/questioncopyright/branches/qc_63 .
--- Merging r412 into '.':
U profiles/default/default.profile
U INSTALL.txt
U themes/bluemarine/page.tpl.php
U themes/bluemarine/screenshot.png
U themes/bluemarine/logo.png
U themes/bluemarine/comment.tpl.php
A themes/bluemarine/style-rtl.css
U themes/bluemarine/style.css
U themes/bluemarine/node.tpl.php
U themes/bluemarine/box.tpl.php
A themes/bluemarine/bluemarine.info
U themes/bluemarine/block.tpl.php
U themes/engines/phptemplate/phptemplate.engine
D themes/engines/phptemplate/comment.tpl.php
D themes/engines/phptemplate/default.tpl.php
D themes/engines/phptemplate/node.tpl.php
D themes/engines/phptemplate/box.tpl.php
D themes/engines/phptemplate/block.tpl.php
A themes/garland/maintenance-page.tpl.php
U themes/garland/print.css
U themes/garland/comment.tpl.php
A themes/garland/style-rtl.css
U themes/garland/style.css
U themes/garland/page.tpl.php
U themes/garland/template.php
A themes/garland/garland.info
A themes/garland/images/task-list.png
A themes/garland/images/menu-collapsed-rtl.gif
A themes/garland/fix-ie-rtl.css
A themes/garland/minnelli/minnelli.info
U themes/garland/minnelli/color/color.inc
D themes/garland/minnelli/style.css
A themes/garland/minnelli/minnelli.css
U themes/garland/fix-ie.css
U themes/garland/node.tpl.php
U themes/garland/color/color.inc
U themes/garland/block.tpl.php
A themes/README.txt
U themes/chameleon/common.css
U themes/chameleon/logo.png
A themes/chameleon/chameleon.info
A themes/chameleon/style-rtl.css
U themes/chameleon/style.css
U themes/chameleon/chameleon.theme
U themes/chameleon/marvin/logo.png
A themes/chameleon/marvin/marvin.info
A themes/chameleon/marvin/style-rtl.css
U themes/chameleon/marvin/style.css
A themes/chameleon/marvin/druplicon-watermark-rtl.png
A themes/chameleon/common-rtl.css
A themes/pushbutton/tabs-off-rtl.png
A themes/pushbutton/arrow-prev-rtl.png
A themes/pushbutton/logo-active-rtl.jpg
U themes/pushbutton/style.css
A themes/pushbutton/tabs-option-off-rtl.png
A themes/pushbutton/arrow-next-visited-rtl.png
A themes/pushbutton/logo-hover-rtl.jpg
A themes/pushbutton/pushbutton.info
U themes/pushbutton/node.tpl.php
A themes/pushbutton/arrow-next-hover-rtl.png
U themes/pushbutton/box.tpl.php
U themes/pushbutton/block.tpl.php
A themes/pushbutton/tabs-on-rtl.png
A themes/pushbutton/header-b-rtl.jpg
A themes/pushbutton/forum-container-rtl.jpg
U themes/pushbutton/comment.tpl.php
A themes/pushbutton/style-rtl.css
A themes/pushbutton/arrow-next-rtl.png
A themes/pushbutton/arrow-prev-visited-rtl.png
A themes/pushbutton/logo-background-rtl.jpg
U themes/pushbutton/page.tpl.php
A themes/pushbutton/icon-block-rtl.png
A themes/pushbutton/tabs-option-hover-rtl.png
A themes/pushbutton/forum-link-rtl.png
A themes/pushbutton/arrow-prev-hover-rtl.png
A themes/pushbutton/icon-comment-rtl.png
U robots.txt
A COPYRIGHT.txt
D sites/default/settings.php
U sites/all/themes/questioncopyright/page.tpl.php
U sites/all/themes/questioncopyright/comment.tpl.php
U sites/all/themes/questioncopyright/style.css
U sites/all/themes/questioncopyright/block.tpl.php
A scripts/drupal.sh
U scripts/code-style.pl
U INSTALL.mysql.txt
U MAINTAINERS.txt
A misc/tree.png
U misc/print.css
U misc/jquery.js
A misc/draggable.png
A misc/batch.js
A misc/teaser.js
U misc/favicon.ico
U misc/drupal.js
A misc/ahah.js
U misc/collapse.js
U misc/progress.js
U misc/farbtastic/farbtastic.css
U misc/farbtastic/farbtastic.js
D misc/maintenance.css
D misc/update.js
D misc/upload.js
A misc/print-rtl.css
A misc/tree-bottom.png
U misc/textarea.js
A misc/menu-collapsed-rtl.png
A misc/jquery.form.js
A misc/tabledrag.js
U misc/tableselect.js
A misc/tableheader.js
U misc/autocomplete.js
A misc/form.js
U install.php
U index.php
U UPGRADE.txt
U CHANGELOG.txt
A includes/cache-install.inc
U includes/install.mysql.inc
U includes/bootstrap.inc
U includes/file.inc
A includes/mail.inc
A includes/theme.maintenance.inc
U includes/session.inc
U includes/install.mysqli.inc
U includes/module.inc
U includes/common.inc
U includes/database.pgsql.inc
U includes/path.inc
A includes/database.mysql-common.inc
A includes/actions.inc
U includes/theme.inc
U includes/form.inc
U includes/install.inc
U includes/database.mysql.inc
A includes/image.gd.inc
U includes/database.mysqli.inc
A includes/batch.inc
U includes/image.inc
A includes/language.inc
U includes/unicode.inc
U includes/xmlrpcs.inc
U includes/install.pgsql.inc
U includes/pager.inc
U includes/locale.inc
U includes/tablesort.inc
U includes/cache.inc
U includes/database.inc
U includes/menu.inc
U includes/xmlrpc.inc
A modules/syslog
A modules/syslog/syslog.module
A modules/syslog/syslog.info
A modules/aggregator/aggregator-summary-items.tpl.php
A modules/aggregator/aggregator.admin.inc
A modules/aggregator/aggregator-item.tpl.php
A modules/aggregator/aggregator-wrapper.tpl.php
A modules/aggregator/aggregator-feed-source.tpl.php
U modules/aggregator/aggregator.module
U modules/aggregator/aggregator.install
A modules/aggregator/aggregator-rtl.css
A modules/aggregator/aggregator.pages.inc
U modules/aggregator/aggregator.css
U modules/aggregator/aggregator.info
A modules/aggregator/aggregator-summary-item.tpl.php
D modules/drupal
D modules/watchdog
U modules/blog/blog.module
A modules/blog/blog.pages.inc
U modules/blog/blog.info
U modules/system/admin.css
A modules/system/maintenance-page.tpl.php
A modules/system/system.admin.inc
U modules/system/system.install
A modules/system/defaults-rtl.css
U modules/system/defaults.css
A modules/system/system.js
A modules/system/system-menus-rtl.css
A modules/system/page.tpl.php
A modules/system/system-menus.css
U modules/system/system.module
A modules/system/maintenance.css
A modules/system/system-rtl.css
U modules/system/system.css
A modules/system/box.tpl.php
U modules/system/system.info
A modules/system/block.tpl.php
A modules/system/admin-rtl.css
A modules/upload/upload.admin.inc
U modules/upload/upload.module
A modules/upload/upload.install
U modules/upload/upload.info
A modules/php
A modules/php/php.info
A modules/php/php.module
A modules/php/php.install
U modules/statistics/statistics.install
A modules/statistics/statistics.pages.inc
U modules/statistics/statistics.info
A modules/statistics/statistics.admin.inc
U modules/statistics/statistics.module
A modules/book/book-export-html.tpl.php
U modules/book/book.install
A modules/book/book-rtl.css
A modules/book/book.pages.inc
U modules/book/book.css
A modules/book/book-node-export-html.tpl.php
U modules/book/book.info
A modules/book/book-all-books-block.tpl.php
A modules/book/book.admin.inc
A modules/book/book-navigation.tpl.php
U modules/book/book.module
A modules/translation
A modules/translation/translation.module
A modules/translation/translation.pages.inc
A modules/translation/translation.info
U modules/locale/locale.module
U modules/locale/locale.install
U modules/locale/locale.info
A modules/menu/menu.admin.inc
U modules/menu/menu.module
A modules/menu/menu.install
U modules/menu/menu.info
U modules/search/search.info
A modules/search/search-block-form.tpl.php
A modules/search/search.admin.inc
A modules/search/search-result.tpl.php
A modules/search/search-results.tpl.php
U modules/search/search.module
A modules/search/search-theme-form.tpl.php
U modules/search/search.install
A modules/search/search-rtl.css
A modules/search/search.pages.inc
U modules/search/search.css
U modules/taxonomy/taxonomy.module
A modules/taxonomy/taxonomy.install
A modules/taxonomy/taxonomy.pages.inc
A modules/taxonomy/taxonomy.css
U modules/taxonomy/taxonomy.info
A modules/taxonomy/taxonomy.js
A modules/taxonomy/taxonomy.admin.inc
A modules/openid
A modules/openid/login-bg.png
A modules/openid/openid.module
A modules/openid/openid.install
A modules/openid/openid.pages.inc
A modules/openid/openid.css
A modules/openid/openid.inc
A modules/openid/openid.info
A modules/openid/xrds.inc
A modules/openid/openid.js
U modules/color/color.module
A modules/color/color-rtl.css
U modules/color/color.css
A modules/color/images/hook-rtl.png
U modules/color/color.info
U modules/color/color.js
A modules/update
A modules/update/update.compare.inc
A modules/update/update.fetch.inc
A modules/update/update.report.inc
A modules/update/update.module
A modules/update/update.install
A modules/update/update-rtl.css
A modules/update/update.css
A modules/update/update.settings.inc
A modules/update/update.info
U modules/filter/filter.info
A modules/filter/filter.admin.inc
U modules/filter/filter.module
A modules/filter/filter.install
A modules/filter/filter.pages.inc
U modules/node/node.info
A modules/node/node.admin.inc
U modules/node/content_types.inc
U modules/node/node.module
A modules/node/node.tpl.php
A modules/node/node.install
A modules/node/node-rtl.css
A modules/node/node.pages.inc
U modules/node/node.css
A modules/dblog
A modules/dblog/dblog.info
A modules/dblog/dblog.admin.inc
A modules/dblog/dblog.module
A modules/dblog/dblog.install
A modules/dblog/dblog-rtl.css
A modules/dblog/dblog.css
U modules/help/help.css
U modules/help/help.info
A modules/help/help.admin.inc
U modules/help/help.module
A modules/help/help-rtl.css
U modules/forum/forum.css
A modules/forum/forums.tpl.php
A modules/forum/forum-topic-list.tpl.php
A modules/forum/forum-icon.tpl.php
U modules/forum/forum.info
A modules/forum/forum-list.tpl.php
A modules/forum/forum-topic-navigation.tpl.php
A modules/forum/forum.admin.inc
A modules/forum/forum-submitted.tpl.php
U modules/forum/forum.module
U modules/forum/forum.install
A modules/forum/forum-rtl.css
A modules/forum/forum.pages.inc
A modules/block/block.install
U modules/block/block.css
U modules/block/block.info
A modules/block/block.js
A modules/block/block-admin-display-form.tpl.php
A modules/block/block.admin.inc
U modules/block/block.module
U modules/contact/contact.module
U modules/contact/contact.install
A modules/contact/contact.pages.inc
U modules/contact/contact.info
A modules/contact/contact.admin.inc
U modules/tracker/tracker.module
A modules/tracker/tracker.pages.inc
U modules/tracker/tracker.info
U modules/path/path.module
U modules/path/path.info
A modules/path/path.admin.inc
U modules/ping/ping.module
U modules/ping/ping.info
A modules/profile/profile.admin.inc
A modules/profile/profile-wrapper.tpl.php
U modules/profile/profile.module
U modules/profile/profile.install
A modules/profile/profile.pages.inc
A modules/profile/profile.css
U modules/profile/profile.info
A modules/profile/profile-listing.tpl.php
A modules/profile/profile.js
A modules/profile/profile-block.tpl.php
A modules/comment/comment-folded.tpl.php
A modules/comment/comment.admin.inc
A modules/comment/comment-wrapper.tpl.php
U modules/comment/comment.module
A modules/comment/comment.tpl.php
U modules/comment/comment.install
A modules/comment/comment-rtl.css
A modules/comment/comment.pages.inc
U modules/comment/comment.css
U modules/comment/comment.info
A modules/comment/comment.js
A modules/trigger
A modules/trigger/trigger.admin.inc
A modules/trigger/trigger.module
A modules/trigger/trigger.install
A modules/trigger/trigger.info
--- Merging r412 into 'modules/legacy':
R modules/legacy
--- Merging r412 into '.':
U modules/throttle/throttle.info
A modules/throttle/throttle.admin.inc
U modules/throttle/throttle.module
U modules/poll/poll.info
A modules/poll/poll-results-block.tpl.php
A modules/poll/poll-bar-block.tpl.php
A modules/poll/poll-vote.tpl.php
A modules/poll/poll-results.tpl.php
U modules/poll/poll.module
U modules/poll/poll.install
A modules/poll/poll-bar.tpl.php
A modules/poll/poll-rtl.css
A modules/poll/poll.pages.inc
U modules/poll/poll.css
A modules/README.txt
U modules/blogapi/blogapi.module
A modules/blogapi/blogapi.install
U modules/blogapi/blogapi.info
A modules/user/user-profile.tpl.php
U modules/user/user.module
A modules/user/user.install
A modules/user/user-rtl.css
A modules/user/user.pages.inc
U modules/user/user.css
U modules/user/user.info
A modules/user/user.js
A modules/user/user-picture.tpl.php
A modules/user/user-profile-category.tpl.php
A modules/user/user-profile-item.tpl.php
A modules/user/user.admin.inc
U update.php
U INSTALL.pgsql.txt
U .htaccess
$
### Whoa. So why did r412 merge when I did it explicitly, but not
### merge as part of the r412-417 range?
=*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*=
2. The output of 'svn log'.
=*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*=
$ svn log -v http://svn.red-bean.com/repos/questioncopyright
------------------------------------------------------------------------
r417 | (redacted) | (redacted) | 1 line
[No branch changes here.]
------------------------------------------------------------------------
r416 | (redacted) | (redacted) | 1 line
[No branch changes here.]
------------------------------------------------------------------------
r415 | heine | 2008-07-10 12:08:45 -0400 (Thu, 10 Jul 2008) | 1 line
Changed paths:
D /branches/qc_63/modules/legacy
Remove the legacy module
------------------------------------------------------------------------
r414 | heine | 2008-07-10 12:06:34 -0400 (Thu, 10 Jul 2008) | 1 line
Changed paths:
A /branches/qc_63/sites/all/modules/custom
A /branches/qc_63/sites/all/modules/custom/commenttip
A /branches/qc_63/sites/all/modules/custom/commenttip/README.txt
A /branches/qc_63/sites/all/modules/custom/commenttip/commenttip.info
A /branches/qc_63/sites/all/modules/custom/commenttip/commenttip.module
A /branches/qc_63/sites/all/modules/custom/commenttip/jtooltips
A /branches/qc_63/sites/all/modules/custom/commenttip/jtooltips/LICENSE.txt
A /branches/qc_63/sites/all/modules/custom/commenttip/jtooltips/README
A /branches/qc_63/sites/all/modules/custom/commenttip/jtooltips/js
A /branches/qc_63/sites/all/modules/custom/commenttip/jtooltips/js/jquery.tooltip.pack.js
A /branches/qc_63/sites/all/modules/custom/commenttip/jtooltips/jtooltips.css
A /branches/qc_63/sites/all/modules/custom/commenttip/jtooltips/jtooltips.info
A /branches/qc_63/sites/all/modules/custom/commenttip/jtooltips/jtooltips.install
A /branches/qc_63/sites/all/modules/custom/commenttip/jtooltips/jtooltips.module
A /branches/qc_63/sites/all/modules/custom/commenttip/jtooltips/sweettitles.css
Added the custom Commenttip module that provides a view of the comment body in a tooltip on administration pages to speed up moderation
------------------------------------------------------------------------
r413 | heine | 2008-07-10 12:05:33 -0400 (Thu, 10 Jul 2008) | 1 line
Changed paths:
A /branches/qc_63/sites/all/themes/questioncopyright/questioncopyright.info
A /branches/qc_63/sites/default/default.settings.php
Add a few other files to ensure 6.3 compatability
------------------------------------------------------------------------
r412 | heine | 2008-07-10 12:01:19 -0400 (Thu, 10 Jul 2008) | 1 line
Changed paths:
M /branches/qc_63/.htaccess
M /branches/qc_63/CHANGELOG.txt
A /branches/qc_63/COPYRIGHT.txt
M /branches/qc_63/INSTALL.mysql.txt
M /branches/qc_63/INSTALL.pgsql.txt
M /branches/qc_63/INSTALL.txt
M /branches/qc_63/MAINTAINERS.txt
M /branches/qc_63/UPGRADE.txt
A /branches/qc_63/includes/actions.inc
A /branches/qc_63/includes/batch.inc
M /branches/qc_63/includes/bootstrap.inc
A /branches/qc_63/includes/cache-install.inc
M /branches/qc_63/includes/cache.inc
M /branches/qc_63/includes/common.inc
M /branches/qc_63/includes/database.inc
A /branches/qc_63/includes/database.mysql-common.inc
M /branches/qc_63/includes/database.mysql.inc
M /branches/qc_63/includes/database.mysqli.inc
M /branches/qc_63/includes/database.pgsql.inc
M /branches/qc_63/includes/file.inc
M /branches/qc_63/includes/form.inc
A /branches/qc_63/includes/image.gd.inc
M /branches/qc_63/includes/image.inc
M /branches/qc_63/includes/install.inc
M /branches/qc_63/includes/install.mysql.inc
M /branches/qc_63/includes/install.mysqli.inc
M /branches/qc_63/includes/install.pgsql.inc
A /branches/qc_63/includes/language.inc
M /branches/qc_63/includes/locale.inc
A /branches/qc_63/includes/mail.inc
M /branches/qc_63/includes/menu.inc
M /branches/qc_63/includes/module.inc
M /branches/qc_63/includes/pager.inc
M /branches/qc_63/includes/path.inc
M /branches/qc_63/includes/session.inc
M /branches/qc_63/includes/tablesort.inc
M /branches/qc_63/includes/theme.inc
A /branches/qc_63/includes/theme.maintenance.inc
M /branches/qc_63/includes/unicode.inc
M /branches/qc_63/includes/xmlrpc.inc
M /branches/qc_63/includes/xmlrpcs.inc
M /branches/qc_63/index.php
M /branches/qc_63/install.php
A /branches/qc_63/misc/ahah.js
M /branches/qc_63/misc/autocomplete.js
A /branches/qc_63/misc/batch.js
M /branches/qc_63/misc/collapse.js
A /branches/qc_63/misc/draggable.png
M /branches/qc_63/misc/drupal.js
M /branches/qc_63/misc/farbtastic/farbtastic.css
M /branches/qc_63/misc/farbtastic/farbtastic.js
M /branches/qc_63/misc/favicon.ico
A /branches/qc_63/misc/form.js
A /branches/qc_63/misc/jquery.form.js
M /branches/qc_63/misc/jquery.js
D /branches/qc_63/misc/maintenance.css
A /branches/qc_63/misc/menu-collapsed-rtl.png
A /branches/qc_63/misc/print-rtl.css
M /branches/qc_63/misc/print.css
M /branches/qc_63/misc/progress.js
A /branches/qc_63/misc/tabledrag.js
A /branches/qc_63/misc/tableheader.js
M /branches/qc_63/misc/tableselect.js
A /branches/qc_63/misc/teaser.js
M /branches/qc_63/misc/textarea.js
A /branches/qc_63/misc/tree-bottom.png
A /branches/qc_63/misc/tree.png
D /branches/qc_63/misc/update.js
D /branches/qc_63/misc/upload.js
A /branches/qc_63/modules/README.txt
A /branches/qc_63/modules/aggregator/aggregator-feed-source.tpl.php
A /branches/qc_63/modules/aggregator/aggregator-item.tpl.php
A /branches/qc_63/modules/aggregator/aggregator-rtl.css
A /branches/qc_63/modules/aggregator/aggregator-summary-item.tpl.php
A /branches/qc_63/modules/aggregator/aggregator-summary-items.tpl.php
A /branches/qc_63/modules/aggregator/aggregator-wrapper.tpl.php
A /branches/qc_63/modules/aggregator/aggregator.admin.inc
M /branches/qc_63/modules/aggregator/aggregator.css
M /branches/qc_63/modules/aggregator/aggregator.info
M /branches/qc_63/modules/aggregator/aggregator.install
M /branches/qc_63/modules/aggregator/aggregator.module
A /branches/qc_63/modules/aggregator/aggregator.pages.inc
A /branches/qc_63/modules/block/block-admin-display-form.tpl.php
A /branches/qc_63/modules/block/block.admin.inc
M /branches/qc_63/modules/block/block.css
M /branches/qc_63/modules/block/block.info
A /branches/qc_63/modules/block/block.install
A /branches/qc_63/modules/block/block.js
M /branches/qc_63/modules/block/block.module
M /branches/qc_63/modules/blog/blog.info
M /branches/qc_63/modules/blog/blog.module
A /branches/qc_63/modules/blog/blog.pages.inc
M /branches/qc_63/modules/blogapi/blogapi.info
A /branches/qc_63/modules/blogapi/blogapi.install
M /branches/qc_63/modules/blogapi/blogapi.module
A /branches/qc_63/modules/book/book-all-books-block.tpl.php
A /branches/qc_63/modules/book/book-export-html.tpl.php
A /branches/qc_63/modules/book/book-navigation.tpl.php
A /branches/qc_63/modules/book/book-node-export-html.tpl.php
A /branches/qc_63/modules/book/book-rtl.css
A /branches/qc_63/modules/book/book.admin.inc
M /branches/qc_63/modules/book/book.css
M /branches/qc_63/modules/book/book.info
M /branches/qc_63/modules/book/book.install
M /branches/qc_63/modules/book/book.module
A /branches/qc_63/modules/book/book.pages.inc
A /branches/qc_63/modules/color/color-rtl.css
M /branches/qc_63/modules/color/color.css
M /branches/qc_63/modules/color/color.info
M /branches/qc_63/modules/color/color.js
M /branches/qc_63/modules/color/color.module
A /branches/qc_63/modules/color/images/hook-rtl.png
A /branches/qc_63/modules/comment/comment-folded.tpl.php
A /branches/qc_63/modules/comment/comment-rtl.css
A /branches/qc_63/modules/comment/comment-wrapper.tpl.php
A /branches/qc_63/modules/comment/comment.admin.inc
M /branches/qc_63/modules/comment/comment.css
M /branches/qc_63/modules/comment/comment.info
M /branches/qc_63/modules/comment/comment.install
A /branches/qc_63/modules/comment/comment.js
M /branches/qc_63/modules/comment/comment.module
A /branches/qc_63/modules/comment/comment.pages.inc
A /branches/qc_63/modules/comment/comment.tpl.php
A /branches/qc_63/modules/contact/contact.admin.inc
M /branches/qc_63/modules/contact/contact.info
M /branches/qc_63/modules/contact/contact.install
M /branches/qc_63/modules/contact/contact.module
A /branches/qc_63/modules/contact/contact.pages.inc
A /branches/qc_63/modules/dblog
A /branches/qc_63/modules/dblog/dblog-rtl.css
A /branches/qc_63/modules/dblog/dblog.admin.inc
A /branches/qc_63/modules/dblog/dblog.css
A /branches/qc_63/modules/dblog/dblog.info
A /branches/qc_63/modules/dblog/dblog.install
A /branches/qc_63/modules/dblog/dblog.module
D /branches/qc_63/modules/drupal
A /branches/qc_63/modules/filter/filter.admin.inc
M /branches/qc_63/modules/filter/filter.info
A /branches/qc_63/modules/filter/filter.install
M /branches/qc_63/modules/filter/filter.module
A /branches/qc_63/modules/filter/filter.pages.inc
A /branches/qc_63/modules/forum/forum-icon.tpl.php
A /branches/qc_63/modules/forum/forum-list.tpl.php
A /branches/qc_63/modules/forum/forum-rtl.css
A /branches/qc_63/modules/forum/forum-submitted.tpl.php
A /branches/qc_63/modules/forum/forum-topic-list.tpl.php
A /branches/qc_63/modules/forum/forum-topic-navigation.tpl.php
A /branches/qc_63/modules/forum/forum.admin.inc
M /branches/qc_63/modules/forum/forum.css
M /branches/qc_63/modules/forum/forum.info
M /branches/qc_63/modules/forum/forum.install
M /branches/qc_63/modules/forum/forum.module
A /branches/qc_63/modules/forum/forum.pages.inc
A /branches/qc_63/modules/forum/forums.tpl.php
A /branches/qc_63/modules/help/help-rtl.css
A /branches/qc_63/modules/help/help.admin.inc
M /branches/qc_63/modules/help/help.css
M /branches/qc_63/modules/help/help.info
M /branches/qc_63/modules/help/help.module
R /branches/qc_63/modules/legacy
M /branches/qc_63/modules/locale/locale.info
M /branches/qc_63/modules/locale/locale.install
M /branches/qc_63/modules/locale/locale.module
A /branches/qc_63/modules/menu/menu.admin.inc
M /branches/qc_63/modules/menu/menu.info
A /branches/qc_63/modules/menu/menu.install
M /branches/qc_63/modules/menu/menu.module
M /branches/qc_63/modules/node/content_types.inc
A /branches/qc_63/modules/node/node-rtl.css
A /branches/qc_63/modules/node/node.admin.inc
M /branches/qc_63/modules/node/node.css
M /branches/qc_63/modules/node/node.info
A /branches/qc_63/modules/node/node.install
M /branches/qc_63/modules/node/node.module
A /branches/qc_63/modules/node/node.pages.inc
A /branches/qc_63/modules/node/node.tpl.php
A /branches/qc_63/modules/openid
A /branches/qc_63/modules/openid/login-bg.png
A /branches/qc_63/modules/openid/openid.css
A /branches/qc_63/modules/openid/openid.inc
A /branches/qc_63/modules/openid/openid.info
A /branches/qc_63/modules/openid/openid.install
A /branches/qc_63/modules/openid/openid.js
A /branches/qc_63/modules/openid/openid.module
A /branches/qc_63/modules/openid/openid.pages.inc
A /branches/qc_63/modules/openid/xrds.inc
A /branches/qc_63/modules/path/path.admin.inc
M /branches/qc_63/modules/path/path.info
M /branches/qc_63/modules/path/path.module
A /branches/qc_63/modules/php
A /branches/qc_63/modules/php/php.info
A /branches/qc_63/modules/php/php.install
A /branches/qc_63/modules/php/php.module
M /branches/qc_63/modules/ping/ping.info
M /branches/qc_63/modules/ping/ping.module
A /branches/qc_63/modules/poll/poll-bar-block.tpl.php
A /branches/qc_63/modules/poll/poll-bar.tpl.php
A /branches/qc_63/modules/poll/poll-results-block.tpl.php
A /branches/qc_63/modules/poll/poll-results.tpl.php
A /branches/qc_63/modules/poll/poll-rtl.css
A /branches/qc_63/modules/poll/poll-vote.tpl.php
M /branches/qc_63/modules/poll/poll.css
M /branches/qc_63/modules/poll/poll.info
M /branches/qc_63/modules/poll/poll.install
M /branches/qc_63/modules/poll/poll.module
A /branches/qc_63/modules/poll/poll.pages.inc
A /branches/qc_63/modules/profile/profile-block.tpl.php
A /branches/qc_63/modules/profile/profile-listing.tpl.php
A /branches/qc_63/modules/profile/profile-wrapper.tpl.php
A /branches/qc_63/modules/profile/profile.admin.inc
A /branches/qc_63/modules/profile/profile.css
M /branches/qc_63/modules/profile/profile.info
M /branches/qc_63/modules/profile/profile.install
A /branches/qc_63/modules/profile/profile.js
M /branches/qc_63/modules/profile/profile.module
A /branches/qc_63/modules/profile/profile.pages.inc
A /branches/qc_63/modules/search/search-block-form.tpl.php
A /branches/qc_63/modules/search/search-result.tpl.php
A /branches/qc_63/modules/search/search-results.tpl.php
A /branches/qc_63/modules/search/search-rtl.css
A /branches/qc_63/modules/search/search-theme-form.tpl.php
A /branches/qc_63/modules/search/search.admin.inc
M /branches/qc_63/modules/search/search.css
M /branches/qc_63/modules/search/search.info
M /branches/qc_63/modules/search/search.install
M /branches/qc_63/modules/search/search.module
A /branches/qc_63/modules/search/search.pages.inc
A /branches/qc_63/modules/statistics/statistics.admin.inc
M /branches/qc_63/modules/statistics/statistics.info
M /branches/qc_63/modules/statistics/statistics.install
M /branches/qc_63/modules/statistics/statistics.module
A /branches/qc_63/modules/statistics/statistics.pages.inc
A /branches/qc_63/modules/syslog
A /branches/qc_63/modules/syslog/syslog.info
A /branches/qc_63/modules/syslog/syslog.module
A /branches/qc_63/modules/system/admin-rtl.css
M /branches/qc_63/modules/system/admin.css
A /branches/qc_63/modules/system/block.tpl.php
A /branches/qc_63/modules/system/box.tpl.php
A /branches/qc_63/modules/system/defaults-rtl.css
M /branches/qc_63/modules/system/defaults.css
A /branches/qc_63/modules/system/maintenance-page.tpl.php
A /branches/qc_63/modules/system/maintenance.css
A /branches/qc_63/modules/system/page.tpl.php
A /branches/qc_63/modules/system/system-menus-rtl.css
A /branches/qc_63/modules/system/system-menus.css
A /branches/qc_63/modules/system/system-rtl.css
A /branches/qc_63/modules/system/system.admin.inc
M /branches/qc_63/modules/system/system.css
M /branches/qc_63/modules/system/system.info
M /branches/qc_63/modules/system/system.install
A /branches/qc_63/modules/system/system.js
M /branches/qc_63/modules/system/system.module
A /branches/qc_63/modules/taxonomy/taxonomy.admin.inc
A /branches/qc_63/modules/taxonomy/taxonomy.css
M /branches/qc_63/modules/taxonomy/taxonomy.info
A /branches/qc_63/modules/taxonomy/taxonomy.install
A /branches/qc_63/modules/taxonomy/taxonomy.js
M /branches/qc_63/modules/taxonomy/taxonomy.module
A /branches/qc_63/modules/taxonomy/taxonomy.pages.inc
A /branches/qc_63/modules/throttle/throttle.admin.inc
M /branches/qc_63/modules/throttle/throttle.info
M /branches/qc_63/modules/throttle/throttle.module
M /branches/qc_63/modules/tracker/tracker.info
M /branches/qc_63/modules/tracker/tracker.module
A /branches/qc_63/modules/tracker/tracker.pages.inc
A /branches/qc_63/modules/translation
A /branches/qc_63/modules/translation/translation.info
A /branches/qc_63/modules/translation/translation.module
A /branches/qc_63/modules/translation/translation.pages.inc
A /branches/qc_63/modules/trigger
A /branches/qc_63/modules/trigger/trigger.admin.inc
A /branches/qc_63/modules/trigger/trigger.info
A /branches/qc_63/modules/trigger/trigger.install
A /branches/qc_63/modules/trigger/trigger.module
A /branches/qc_63/modules/update
A /branches/qc_63/modules/update/update-rtl.css
A /branches/qc_63/modules/update/update.compare.inc
A /branches/qc_63/modules/update/update.css
A /branches/qc_63/modules/update/update.fetch.inc
A /branches/qc_63/modules/update/update.info
A /branches/qc_63/modules/update/update.install
A /branches/qc_63/modules/update/update.module
A /branches/qc_63/modules/update/update.report.inc
A /branches/qc_63/modules/update/update.settings.inc
A /branches/qc_63/modules/upload/upload.admin.inc
M /branches/qc_63/modules/upload/upload.info
A /branches/qc_63/modules/upload/upload.install
M /branches/qc_63/modules/upload/upload.module
A /branches/qc_63/modules/user/user-picture.tpl.php
A /branches/qc_63/modules/user/user-profile-category.tpl.php
A /branches/qc_63/modules/user/user-profile-item.tpl.php
A /branches/qc_63/modules/user/user-profile.tpl.php
A /branches/qc_63/modules/user/user-rtl.css
A /branches/qc_63/modules/user/user.admin.inc
M /branches/qc_63/modules/user/user.css
M /branches/qc_63/modules/user/user.info
A /branches/qc_63/modules/user/user.install
A /branches/qc_63/modules/user/user.js
M /branches/qc_63/modules/user/user.module
A /branches/qc_63/modules/user/user.pages.inc
D /branches/qc_63/modules/watchdog
M /branches/qc_63/profiles/default/default.profile
M /branches/qc_63/robots.txt
M /branches/qc_63/scripts/code-style.pl
A /branches/qc_63/scripts/drupal.sh
M /branches/qc_63/sites/all/themes/questioncopyright/block.tpl.php
M /branches/qc_63/sites/all/themes/questioncopyright/comment.tpl.php
M /branches/qc_63/sites/all/themes/questioncopyright/page.tpl.php
M /branches/qc_63/sites/all/themes/questioncopyright/style.css
D /branches/qc_63/sites/default/settings.php
A /branches/qc_63/themes/README.txt
M /branches/qc_63/themes/bluemarine/block.tpl.php
A /branches/qc_63/themes/bluemarine/bluemarine.info
M /branches/qc_63/themes/bluemarine/box.tpl.php
M /branches/qc_63/themes/bluemarine/comment.tpl.php
M /branches/qc_63/themes/bluemarine/logo.png
M /branches/qc_63/themes/bluemarine/node.tpl.php
M /branches/qc_63/themes/bluemarine/page.tpl.php
M /branches/qc_63/themes/bluemarine/screenshot.png
A /branches/qc_63/themes/bluemarine/style-rtl.css
M /branches/qc_63/themes/bluemarine/style.css
A /branches/qc_63/themes/chameleon/chameleon.info
M /branches/qc_63/themes/chameleon/chameleon.theme
A /branches/qc_63/themes/chameleon/common-rtl.css
M /branches/qc_63/themes/chameleon/common.css
M /branches/qc_63/themes/chameleon/logo.png
A /branches/qc_63/themes/chameleon/marvin/druplicon-watermark-rtl.png
M /branches/qc_63/themes/chameleon/marvin/logo.png
A /branches/qc_63/themes/chameleon/marvin/marvin.info
A /branches/qc_63/themes/chameleon/marvin/style-rtl.css
M /branches/qc_63/themes/chameleon/marvin/style.css
A /branches/qc_63/themes/chameleon/style-rtl.css
M /branches/qc_63/themes/chameleon/style.css
D /branches/qc_63/themes/engines/phptemplate/block.tpl.php
D /branches/qc_63/themes/engines/phptemplate/box.tpl.php
D /branches/qc_63/themes/engines/phptemplate/comment.tpl.php
D /branches/qc_63/themes/engines/phptemplate/default.tpl.php
D /branches/qc_63/themes/engines/phptemplate/node.tpl.php
M /branches/qc_63/themes/engines/phptemplate/phptemplate.engine
M /branches/qc_63/themes/garland/block.tpl.php
M /branches/qc_63/themes/garland/color/color.inc
M /branches/qc_63/themes/garland/comment.tpl.php
A /branches/qc_63/themes/garland/fix-ie-rtl.css
M /branches/qc_63/themes/garland/fix-ie.css
A /branches/qc_63/themes/garland/garland.info
A /branches/qc_63/themes/garland/images/menu-collapsed-rtl.gif
A /branches/qc_63/themes/garland/images/task-list.png
A /branches/qc_63/themes/garland/maintenance-page.tpl.php
M /branches/qc_63/themes/garland/minnelli/color/color.inc
A /branches/qc_63/themes/garland/minnelli/minnelli.css
A /branches/qc_63/themes/garland/minnelli/minnelli.info
D /branches/qc_63/themes/garland/minnelli/style.css
M /branches/qc_63/themes/garland/node.tpl.php
M /branches/qc_63/themes/garland/page.tpl.php
M /branches/qc_63/themes/garland/print.css
A /branches/qc_63/themes/garland/style-rtl.css
M /branches/qc_63/themes/garland/style.css
M /branches/qc_63/themes/garland/template.php
A /branches/qc_63/themes/pushbutton/arrow-next-hover-rtl.png
A /branches/qc_63/themes/pushbutton/arrow-next-rtl.png
A /branches/qc_63/themes/pushbutton/arrow-next-visited-rtl.png
A /branches/qc_63/themes/pushbutton/arrow-prev-hover-rtl.png
A /branches/qc_63/themes/pushbutton/arrow-prev-rtl.png
A /branches/qc_63/themes/pushbutton/arrow-prev-visited-rtl.png
M /branches/qc_63/themes/pushbutton/block.tpl.php
M /branches/qc_63/themes/pushbutton/box.tpl.php
M /branches/qc_63/themes/pushbutton/comment.tpl.php
A /branches/qc_63/themes/pushbutton/forum-container-rtl.jpg
A /branches/qc_63/themes/pushbutton/forum-link-rtl.png
A /branches/qc_63/themes/pushbutton/header-b-rtl.jpg
A /branches/qc_63/themes/pushbutton/icon-block-rtl.png
A /branches/qc_63/themes/pushbutton/icon-comment-rtl.png
A /branches/qc_63/themes/pushbutton/logo-active-rtl.jpg
A /branches/qc_63/themes/pushbutton/logo-background-rtl.jpg
A /branches/qc_63/themes/pushbutton/logo-hover-rtl.jpg
M /branches/qc_63/themes/pushbutton/node.tpl.php
M /branches/qc_63/themes/pushbutton/page.tpl.php
A /branches/qc_63/themes/pushbutton/pushbutton.info
A /branches/qc_63/themes/pushbutton/style-rtl.css
M /branches/qc_63/themes/pushbutton/style.css
A /branches/qc_63/themes/pushbutton/tabs-off-rtl.png
A /branches/qc_63/themes/pushbutton/tabs-on-rtl.png
A /branches/qc_63/themes/pushbutton/tabs-option-hover-rtl.png
A /branches/qc_63/themes/pushbutton/tabs-option-off-rtl.png
M /branches/qc_63/update.php
Updated to Drupal 6.3
------------------------------------------------------------------------
r411 | heine | 2008-07-10 06:37:26 -0400 (Thu, 10 Jul 2008) | 1 line
Changed paths:
A /branches/qc_63 (from /trunk:410)
Prepare the 6.3 upgrade in a branch
------------------------------------------------------------------------
=*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*=
3. A listing of what paths had mergeinfo (seems to be always empty):
=*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*= =*=
$ svn pget -rBASE -vR svn:mergeinfo questioncopyright/
Properties on 'cm/corporation/state/ca-articles-of-incorporation.odt':
svn:mergeinfo
Properties on 'cm/images/qco-ca-ftc-exemption-determination-p1.jpg':
svn:mergeinfo
Properties on 'cm/images/qco-ca-ftc-exemption-determination-p2.jpg':
svn:mergeinfo
Properties on 'cm/corporation/financial/finances.txt':
svn:mergeinfo
Properties on 'cm/corporation/federal/EIN.txt':
svn:mergeinfo
Properties on 'cm/images/logo-black-on-white.ai':
svn:mergeinfo
Properties on 'cm/corporation/state/ftb/form-3500/3500-7fghi.odt':
svn:mergeinfo
Properties on 'cm/corporation/state/ftb/form-3500/attachments.html':
svn:mergeinfo
Properties on 'cm/presentations/creation-myths':
svn:mergeinfo
Properties on 'cm/images/logo-med-white-on-blue.jpg':
svn:mergeinfo
Properties on 'cm/corporation/federal/EIN-CP575Notice_1201037070019.pdf':
svn:mergeinfo
Properties on 'cm/corporation/state/ftb/form-3500/3500-7c.odt':
svn:mergeinfo
Properties on 'cm/corporation/state/ftb/form-3500/3500-7d.odt':
svn:mergeinfo
Properties on 'cm/images/logo-small-white-on-blue.jpg':
svn:mergeinfo
Properties on 'cm/corporation/state/ftb/form-3500/3500-7e.odt':
svn:mergeinfo
Properties on 'cm/corporation/federal/activities.html':
svn:mergeinfo
Properties on 'cm/corporation/federal/2008-2011-projected-budget.gnumeric':
svn:mergeinfo
Properties on 'cm/images/registration-page.jpg':
svn:mergeinfo
Properties on 'cm/images/logo-black-on-white-bounded.eps':
svn:mergeinfo
Properties on 'cm/corporation/state/ftb/form-3500/3500-6fg.odt':
svn:mergeinfo
Properties on 'cm/images/logo-black-on-white-unbounded.eps':
svn:mergeinfo
$
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-17 22:49:30 CEST