merge default into stable for 1.7 freeze stable
authorMatt Mackall <mpm@selenic.com>
Wed, 20 Oct 2010 17:06:42 -0500
branchstable
changeset 12795 3cb0559e44d0
parent 12793 469850088fc1 (diff)
parent 12794 6bf8d48bec8e (current diff)
child 12796 bc69ba99e34b
merge default into stable for 1.7 freeze
mercurial/streamclone.py
tests/darcs/darcs1/_darcs/inventory
tests/darcs/darcs1/_darcs/prefs/author
tests/darcs/darcs1/_darcs/prefs/binaries
tests/darcs/darcs1/_darcs/prefs/boring
tests/darcs/darcs1/_darcs/prefs/motd
tests/darcs/darcs1/_darcs/pristine/a
tests/darcs/darcs1/a
tests/filtertmp.py
tests/helpers.sh
tests/test-1102
tests/test-1102.out
tests/test-586
tests/test-586.out
tests/test-abort-checkin
tests/test-abort-checkin.out
tests/test-acl
tests/test-acl.out
tests/test-add
tests/test-add.out
tests/test-addremove
tests/test-addremove-similar
tests/test-addremove-similar.out
tests/test-addremove.out
tests/test-alias
tests/test-alias.out
tests/test-annotate
tests/test-annotate.out
tests/test-archive
tests/test-archive-symlinks
tests/test-archive-symlinks.out
tests/test-archive.out
tests/test-audit-path
tests/test-audit-path.out
tests/test-backout
tests/test-backout.out
tests/test-backwards-remove
tests/test-backwards-remove.out
tests/test-bad-extension
tests/test-bad-extension.out
tests/test-bad-pull
tests/test-bad-pull.out
tests/test-basic
tests/test-basic.out
tests/test-bheads
tests/test-bheads.out
tests/test-bisect
tests/test-bisect.out
tests/test-bisect2
tests/test-bisect2.out
tests/test-bookmarks
tests/test-bookmarks-current
tests/test-bookmarks-current.out
tests/test-bookmarks-rebase
tests/test-bookmarks-rebase.out
tests/test-bookmarks-strip
tests/test-bookmarks-strip.out
tests/test-bookmarks.out
tests/test-branch-option
tests/test-branch-option.out
tests/test-branches
tests/test-branches.out
tests/test-branchmap
tests/test-branchmap.out
tests/test-bundle
tests/test-bundle-r
tests/test-bundle-r.out
tests/test-bundle-type
tests/test-bundle-type.out
tests/test-bundle-vs-outgoing
tests/test-bundle-vs-outgoing.out
tests/test-bundle.out
tests/test-casefolding
tests/test-casefolding.out
tests/test-cat
tests/test-cat.out
tests/test-changelog-exec
tests/test-changelog-exec.out
tests/test-check-code
tests/test-check-code.out
tests/test-children
tests/test-children.out
tests/test-churn
tests/test-churn.out
tests/test-clone
tests/test-clone-cgi
tests/test-clone-cgi.out
tests/test-clone-failure
tests/test-clone-failure.out
tests/test-clone-pull-corruption
tests/test-clone-pull-corruption.out
tests/test-clone-r
tests/test-clone-r.out
tests/test-clone-update-order
tests/test-clone-update-order.out
tests/test-clone.out
tests/test-command-template
tests/test-command-template.out
tests/test-commit
tests/test-commit-copy
tests/test-commit-copy.out
tests/test-commit-unresolved
tests/test-commit-unresolved.out
tests/test-commit.out
tests/test-committer
tests/test-committer.out
tests/test-config-case
tests/test-config-case.out
tests/test-conflict
tests/test-conflict.out
tests/test-confused-revert
tests/test-confused-revert.out
tests/test-convert
tests/test-convert-authormap
tests/test-convert-authormap.out
tests/test-convert-bzr
tests/test-convert-bzr-114
tests/test-convert-bzr-114.out
tests/test-convert-bzr-directories
tests/test-convert-bzr-directories.out
tests/test-convert-bzr-ghosts
tests/test-convert-bzr-ghosts.out
tests/test-convert-bzr-merges
tests/test-convert-bzr-merges.out
tests/test-convert-bzr-treeroot
tests/test-convert-bzr-treeroot.out
tests/test-convert-bzr.out
tests/test-convert-clonebranches
tests/test-convert-clonebranches.out
tests/test-convert-cvs
tests/test-convert-cvs-branch
tests/test-convert-cvs-branch.out
tests/test-convert-cvs-detectmerge
tests/test-convert-cvs-detectmerge.out
tests/test-convert-cvs-synthetic
tests/test-convert-cvs-synthetic.out
tests/test-convert-cvs.out
tests/test-convert-cvsnt-mergepoints
tests/test-convert-cvsnt-mergepoints.out
tests/test-convert-darcs
tests/test-convert-darcs.out
tests/test-convert-datesort
tests/test-convert-datesort.out
tests/test-convert-filemap
tests/test-convert-filemap.out
tests/test-convert-git
tests/test-convert-git.out
tests/test-convert-hg-sink
tests/test-convert-hg-sink.out
tests/test-convert-hg-source
tests/test-convert-hg-source.out
tests/test-convert-hg-startrev
tests/test-convert-hg-startrev.out
tests/test-convert-hg-svn
tests/test-convert-hg-svn.out
tests/test-convert-mtn
tests/test-convert-mtn.out
tests/test-convert-splicemap
tests/test-convert-splicemap.out
tests/test-convert-svn-branches
tests/test-convert-svn-branches.out
tests/test-convert-svn-encoding
tests/test-convert-svn-encoding.out
tests/test-convert-svn-move
tests/test-convert-svn-move.out
tests/test-convert-svn-sink
tests/test-convert-svn-sink.out
tests/test-convert-svn-source
tests/test-convert-svn-source.out
tests/test-convert-svn-startrev
tests/test-convert-svn-startrev.out
tests/test-convert-svn-tags
tests/test-convert-svn-tags.out
tests/test-convert-tagsbranch-topology
tests/test-convert-tagsbranch-topology.out
tests/test-convert-tla
tests/test-convert-tla.out
tests/test-convert.out
tests/test-copy
tests/test-copy-move-merge
tests/test-copy-move-merge.out
tests/test-copy.out
tests/test-copy2
tests/test-copy2.out
tests/test-custom-filters
tests/test-custom-filters.out
tests/test-debugbuilddag
tests/test-debugbuilddag.out
tests/test-debugcomplete
tests/test-debugcomplete.out
tests/test-debugindexdot
tests/test-debugindexdot.out
tests/test-debugrename
tests/test-debugrename.out
tests/test-default-push
tests/test-default-push.out
tests/test-diff-binary-file
tests/test-diff-binary-file.out
tests/test-diff-change
tests/test-diff-change.out
tests/test-diff-color
tests/test-diff-color.out
tests/test-diff-copy-depth
tests/test-diff-copy-depth.out
tests/test-diff-hashes
tests/test-diff-hashes.out
tests/test-diff-ignore-whitespace
tests/test-diff-ignore-whitespace.out
tests/test-diff-newlines
tests/test-diff-newlines.out
tests/test-diff-reverse
tests/test-diff-reverse.out
tests/test-diff-subdir
tests/test-diff-subdir.out
tests/test-diff-unified
tests/test-diff-unified.out
tests/test-diff-upgrade
tests/test-diff-upgrade.out
tests/test-diffdir
tests/test-diffdir.out
tests/test-diffstat
tests/test-diffstat.out
tests/test-dirstate-future
tests/test-dirstate-future.out
tests/test-dirstatedirs
tests/test-dirstatedirs.out
tests/test-dispatch
tests/test-dispatch.out
tests/test-double-merge
tests/test-double-merge.out
tests/test-dumprevlog
tests/test-dumprevlog.out
tests/test-empty
tests/test-empty-dir
tests/test-empty-dir.out
tests/test-empty-file
tests/test-empty-file.out
tests/test-empty-group
tests/test-empty-group.out
tests/test-empty.out
tests/test-encode
tests/test-encode.out
tests/test-encoding
tests/test-encoding-align
tests/test-encoding-align.out
tests/test-encoding.out
tests/test-eol
tests/test-eol-add
tests/test-eol-add.out
tests/test-eol-clone
tests/test-eol-clone.out
tests/test-eol-hook
tests/test-eol-hook.out
tests/test-eol-patch
tests/test-eol-patch.out
tests/test-eol-update
tests/test-eol-update.out
tests/test-eol.out
tests/test-eolfilename
tests/test-eolfilename.out
tests/test-excessive-merge
tests/test-excessive-merge.out
tests/test-execute-bit
tests/test-execute-bit.out
tests/test-export
tests/test-export.out
tests/test-extdiff
tests/test-extdiff.out
tests/test-extension
tests/test-extension.out
tests/test-extra-filelog-entry
tests/test-extra-filelog-entry.out
tests/test-fetch
tests/test-fetch.out
tests/test-filebranch
tests/test-filebranch.out
tests/test-flags
tests/test-flags.out
tests/test-fncache
tests/test-fncache.out
tests/test-gendoc
tests/test-gendoc.out
tests/test-git-export
tests/test-git-export.out
tests/test-git-import
tests/test-git-import.out
tests/test-globalopts
tests/test-globalopts.out
tests/test-glog
tests/test-glog.out
tests/test-gpg
tests/test-gpg.out
tests/test-grep
tests/test-grep.out
tests/test-hardlinks-safety
tests/test-hardlinks-safety.out
tests/test-help
tests/test-help.out
tests/test-hgcia
tests/test-hgcia.out
tests/test-hghave
tests/test-hghave.out
tests/test-hgignore
tests/test-hgignore.out
tests/test-hgk
tests/test-hgk.out
tests/test-hgrc
tests/test-hgrc.out
tests/test-hgweb
tests/test-hgweb-commands
tests/test-hgweb-commands.out
tests/test-hgweb-descend-empties
tests/test-hgweb-descend-empties.out
tests/test-hgweb-diffs
tests/test-hgweb-diffs.out
tests/test-hgweb-empty
tests/test-hgweb-empty.out
tests/test-hgweb-filelog
tests/test-hgweb-filelog.out
tests/test-hgweb-no-path-info
tests/test-hgweb-no-path-info.out
tests/test-hgweb-no-request-uri
tests/test-hgweb-no-request-uri.out
tests/test-hgweb-removed
tests/test-hgweb-removed.out
tests/test-hgweb.out
tests/test-hgwebdir
tests/test-hgwebdir.out
tests/test-hgwebdirsym
tests/test-hgwebdirsym.out
tests/test-highlight
tests/test-highlight.out
tests/test-hook
tests/test-hook.out
tests/test-http
tests/test-http-clone-r
tests/test-http-clone-r.out
tests/test-http-proxy
tests/test-http-proxy.out
tests/test-http.out
tests/test-hup
tests/test-hup.out
tests/test-identify
tests/test-identify.out
tests/test-impexp-branch
tests/test-impexp-branch.out
tests/test-import
tests/test-import-eol
tests/test-import-eol.out
tests/test-import.out
tests/test-incoming-outgoing
tests/test-incoming-outgoing.out
tests/test-inherit-mode
tests/test-inherit-mode.out
tests/test-init
tests/test-init.out
tests/test-inotify
tests/test-inotify-debuginotify
tests/test-inotify-debuginotify.out
tests/test-inotify-dirty-dirstate
tests/test-inotify-dirty-dirstate.out
tests/test-inotify-issue1208
tests/test-inotify-issue1208.out
tests/test-inotify-issue1371
tests/test-inotify-issue1371.out
tests/test-inotify-issue1542
tests/test-inotify-issue1542.out
tests/test-inotify-issue1556
tests/test-inotify-issue1556.out
tests/test-inotify-lookup
tests/test-inotify-lookup.out
tests/test-inotify.out
tests/test-install
tests/test-install.out
tests/test-interhg
tests/test-interhg.out
tests/test-issue1089
tests/test-issue1089.out
tests/test-issue1175
tests/test-issue1175.out
tests/test-issue1306
tests/test-issue1306.out
tests/test-issue1438
tests/test-issue1438.out
tests/test-issue2137
tests/test-issue2137.out
tests/test-issue322
tests/test-issue322.out
tests/test-issue433
tests/test-issue433.out
tests/test-issue436
tests/test-issue522
tests/test-issue522.out
tests/test-issue612
tests/test-issue612.out
tests/test-issue619
tests/test-issue619.out
tests/test-issue660
tests/test-issue660.out
tests/test-issue672
tests/test-issue672.out
tests/test-issue842
tests/test-issue842.out
tests/test-journal-exists
tests/test-journal-exists.out
tests/test-keyword
tests/test-keyword.out
tests/test-locate
tests/test-locate.out
tests/test-lock-badness
tests/test-lock-badness.out
tests/test-log
tests/test-log.out
tests/test-mactext
tests/test-mactext.out
tests/test-manifest
tests/test-manifest-merging
tests/test-manifest-merging.out
tests/test-manifest.out
tests/test-merge-closedheads
tests/test-merge-closedheads.out
tests/test-merge-commit
tests/test-merge-commit.out
tests/test-merge-default
tests/test-merge-default.out
tests/test-merge-force
tests/test-merge-force.out
tests/test-merge-internal-tools-pattern
tests/test-merge-internal-tools-pattern.out
tests/test-merge-local
tests/test-merge-local.out
tests/test-merge-prompt
tests/test-merge-prompt.out
tests/test-merge-remove
tests/test-merge-remove.out
tests/test-merge-revert
tests/test-merge-revert.out
tests/test-merge-revert2
tests/test-merge-revert2.out
tests/test-merge-symlinks
tests/test-merge-symlinks.out
tests/test-merge-tools
tests/test-merge-tools.out
tests/test-merge-types
tests/test-merge-types.out
tests/test-merge1
tests/test-merge1.out
tests/test-merge10
tests/test-merge10.out
tests/test-merge2
tests/test-merge2.out
tests/test-merge4
tests/test-merge4.out
tests/test-merge5
tests/test-merge5.out
tests/test-merge6
tests/test-merge6.out
tests/test-merge7
tests/test-merge7.out
tests/test-merge8
tests/test-merge8.out
tests/test-merge9
tests/test-merge9.out
tests/test-mq
tests/test-mq-caches
tests/test-mq-caches.out
tests/test-mq-eol
tests/test-mq-eol.out
tests/test-mq-git
tests/test-mq-git.out
tests/test-mq-guards
tests/test-mq-guards.out
tests/test-mq-header-date
tests/test-mq-header-date.out
tests/test-mq-header-from
tests/test-mq-header-from.out
tests/test-mq-merge
tests/test-mq-merge.out
tests/test-mq-missingfiles
tests/test-mq-missingfiles.out
tests/test-mq-pull-from-bundle
tests/test-mq-pull-from-bundle.out
tests/test-mq-qclone-http
tests/test-mq-qclone-http.out
tests/test-mq-qdelete
tests/test-mq-qdelete.out
tests/test-mq-qdiff
tests/test-mq-qdiff.out
tests/test-mq-qfold
tests/test-mq-qfold.out
tests/test-mq-qgoto
tests/test-mq-qgoto.out
tests/test-mq-qimport
tests/test-mq-qimport-fail-cleanup
tests/test-mq-qimport-fail-cleanup.out
tests/test-mq-qimport.out
tests/test-mq-qnew
tests/test-mq-qnew.out
tests/test-mq-qpush-fail
tests/test-mq-qpush-fail.out
tests/test-mq-qqueue
tests/test-mq-qqueue.out
tests/test-mq-qrefresh
tests/test-mq-qrefresh-replace-log-message
tests/test-mq-qrefresh-replace-log-message.out
tests/test-mq-qrefresh.out
tests/test-mq-qrename
tests/test-mq-qrename.out
tests/test-mq-qsave
tests/test-mq-qsave.out
tests/test-mq-safety
tests/test-mq-safety.out
tests/test-mq-strip
tests/test-mq-strip.out
tests/test-mq-symlinks
tests/test-mq-symlinks.out
tests/test-mq.out
tests/test-mv-cp-st-diff
tests/test-mv-cp-st-diff.out
tests/test-nested-repo
tests/test-nested-repo.out
tests/test-newbranch
tests/test-newbranch.out
tests/test-newcgi
tests/test-newcgi.out
tests/test-newercgi
tests/test-newercgi.out
tests/test-non-interactive-wsgi
tests/test-non-interactive-wsgi.out
tests/test-notify
tests/test-notify-changegroup
tests/test-notify-changegroup.out
tests/test-notify.out
tests/test-oldcgi
tests/test-oldcgi.out
tests/test-parentrevspec
tests/test-parentrevspec.out
tests/test-parents
tests/test-parents.out
tests/test-parse-date
tests/test-parse-date.out
tests/test-parseindex
tests/test-parseindex.out
tests/test-patch
tests/test-patch-offset
tests/test-patch-offset.out
tests/test-patch.out
tests/test-patchbomb
tests/test-patchbomb.out
tests/test-paths
tests/test-paths.out
tests/test-permissions
tests/test-permissions.out
tests/test-profile
tests/test-profile.out
tests/test-progress
tests/test-progress.out
tests/test-pull
tests/test-pull-branch
tests/test-pull-branch.out
tests/test-pull-http
tests/test-pull-http.out
tests/test-pull-permission
tests/test-pull-permission.out
tests/test-pull-pull-corruption
tests/test-pull-pull-corruption.out
tests/test-pull-pull-corruption2
tests/test-pull-pull-corruption2.out
tests/test-pull-r
tests/test-pull-r.out
tests/test-pull-update
tests/test-pull-update.out
tests/test-pull.out
tests/test-purge
tests/test-purge.out
tests/test-push-hook-lock
tests/test-push-hook-lock.out
tests/test-push-http
tests/test-push-http.out
tests/test-push-r
tests/test-push-r.out
tests/test-push-validation
tests/test-push-validation.out
tests/test-push-warn
tests/test-push-warn.out
tests/test-qrecord
tests/test-qrecord.out
tests/test-race
tests/test-race.out
tests/test-rebase-abort
tests/test-rebase-abort.out
tests/test-rebase-cache
tests/test-rebase-cache.out
tests/test-rebase-check-restore
tests/test-rebase-check-restore.out
tests/test-rebase-collapse
tests/test-rebase-collapse.out
tests/test-rebase-conflicts
tests/test-rebase-conflicts.out
tests/test-rebase-detach
tests/test-rebase-detach.out
tests/test-rebase-interruptions
tests/test-rebase-interruptions.out
tests/test-rebase-issue-noparam-single-rev
tests/test-rebase-issue-noparam-single-rev.out
tests/test-rebase-keep-branch
tests/test-rebase-keep-branch.out
tests/test-rebase-mq
tests/test-rebase-mq-skip
tests/test-rebase-mq-skip.out
tests/test-rebase-mq.out
tests/test-rebase-newancestor
tests/test-rebase-newancestor.out
tests/test-rebase-parameters
tests/test-rebase-parameters.out
tests/test-rebase-pull
tests/test-rebase-pull.out
tests/test-rebase-rename
tests/test-rebase-rename.out
tests/test-rebase-scenario-global
tests/test-rebase-scenario-global.out
tests/test-rebuildstate
tests/test-rebuildstate.out
tests/test-record
tests/test-record.out
tests/test-relink
tests/test-relink.out
tests/test-remove
tests/test-remove-new
tests/test-remove-new.out
tests/test-remove.out
tests/test-rename
tests/test-rename-after-merge
tests/test-rename-after-merge.out
tests/test-rename-dir-merge
tests/test-rename-dir-merge.out
tests/test-rename-dir-merge2
tests/test-rename-dir-merge2.out
tests/test-rename-merge1
tests/test-rename-merge1.out
tests/test-rename-merge2
tests/test-rename-merge2.out
tests/test-rename.out
tests/test-requires
tests/test-requires.out
tests/test-resolve
tests/test-resolve.out
tests/test-revert
tests/test-revert-flags
tests/test-revert-flags.out
tests/test-revert-unknown
tests/test-revert-unknown.out
tests/test-revert.out
tests/test-revlog-group-emptyiter
tests/test-revlog-group-emptyiter.out
tests/test-revlog-packentry
tests/test-revlog-packentry.out
tests/test-revset
tests/test-revset.out
tests/test-rollback
tests/test-rollback.out
tests/test-schemes
tests/test-schemes.out
tests/test-share
tests/test-share.out
tests/test-simple-update
tests/test-simple-update.out
tests/test-simplemerge-cmd
tests/test-simplemerge-cmd.out
tests/test-ssh
tests/test-ssh-clone-r
tests/test-ssh-clone-r.out
tests/test-ssh.out
tests/test-static-http
tests/test-static-http.out
tests/test-status
tests/test-status-color
tests/test-status-color.out
tests/test-status.out
tests/test-strict
tests/test-strict.out
tests/test-strip-cross
tests/test-strip-cross.out
tests/test-subrepo
tests/test-subrepo-deep-nested-change
tests/test-subrepo-deep-nested-change.out
tests/test-subrepo-relative-path
tests/test-subrepo-relative-path.out
tests/test-subrepo-svn
tests/test-subrepo-svn.out
tests/test-subrepo.out
tests/test-symlink-addremove
tests/test-symlink-addremove.out
tests/test-symlink-basic
tests/test-symlink-basic.out
tests/test-symlink-root
tests/test-symlink-root.out
tests/test-symlinks
tests/test-symlinks.out
tests/test-tag
tests/test-tag.out
tests/test-tags
tests/test-tags.out
tests/test-template-engine
tests/test-template-engine.out
tests/test-transplant
tests/test-transplant.out
tests/test-unrelated-pull
tests/test-unrelated-pull.out
tests/test-up-issue1456
tests/test-up-issue1456.out
tests/test-up-local-change
tests/test-up-local-change.out
tests/test-update-branches
tests/test-update-branches.out
tests/test-update-renames
tests/test-update-renames.out
tests/test-update-reverse
tests/test-update-reverse.out
tests/test-url-rev
tests/test-url-rev.out
tests/test-username-newline
tests/test-username-newline.out
tests/test-verify
tests/test-verify.out
tests/test-walk
tests/test-walk.out
tests/test-webraw
tests/test-webraw.out
tests/test-win32text
tests/test-win32text.out