##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.
Bryan O'Sullivan -
r6385:0d4e068e default
Show More
Name Size Modified Last Commit Author
/ tests
README Loading ...
binfile.bin Loading ...
coverage.py Loading ...
get-with-headers.py Loading ...
hghave Loading ...
legacy-encoding.hg Loading ...
md5sum.py Loading ...
printenv.py Loading ...
readlink.py Loading ...
run-tests.py Loading ...
test-586 Loading ...
test-586.out Loading ...
test-abort-checkin Loading ...
test-abort-checkin.out Loading ...
test-acl Loading ...
test-acl.out Loading ...
test-add Loading ...
test-add.out Loading ...
test-addremove Loading ...
test-addremove-similar Loading ...
test-addremove-similar.out Loading ...
test-addremove.out Loading ...
test-alias Loading ...
test-alias.out Loading ...
test-annotate Loading ...
test-annotate.out Loading ...
test-archive Loading ...
test-archive-symlinks Loading ...
test-archive-symlinks.out Loading ...
test-archive.out Loading ...
test-audit-path Loading ...
test-audit-path.out Loading ...
test-backout Loading ...
test-backout.out Loading ...
test-backwards-remove Loading ...
test-backwards-remove.out Loading ...
test-bad-extension Loading ...
test-bad-extension.out Loading ...
test-bad-pull Loading ...
test-bad-pull.out Loading ...
test-basic Loading ...
test-basic.out Loading ...
test-bdiff Loading ...
test-bdiff.out Loading ...
test-bheads Loading ...
test-bheads.out Loading ...
test-bisect Loading ...
test-bisect.out Loading ...
test-branches Loading ...
test-branches.out Loading ...
test-bundle Loading ...
test-bundle-r Loading ...
test-bundle-r.out Loading ...
test-bundle.out Loading ...
test-cat Loading ...
test-cat.out Loading ...
test-changelog-exec Loading ...
test-changelog-exec.out Loading ...
test-children Loading ...
test-children.out Loading ...
test-churn Loading ...
test-churn.out Loading ...
test-clone Loading ...
test-clone-failure Loading ...
test-clone-failure.out Loading ...
test-clone-pull-corruption Loading ...
test-clone-pull-corruption.out Loading ...
test-clone-r Loading ...
test-clone-r.out Loading ...
test-clone.out Loading ...
test-command-template Loading ...
test-command-template.out Loading ...
test-commit Loading ...
test-commit-copy Loading ...
test-commit-copy.out Loading ...
test-commit.out Loading ...
test-committer Loading ...
test-committer.out Loading ...
test-config-case Loading ...
test-config-case.out Loading ...
test-conflict Loading ...
test-conflict.out Loading ...
test-confused-revert Loading ...
test-confused-revert.out Loading ...
test-context.py Loading ...
test-context.py.out Loading ...
test-convert Loading ...
test-convert-baz Loading ...
test-convert-baz.out Loading ...
test-convert-clonebranches Loading ...
test-convert-clonebranches.out Loading ...
test-convert-cvs Loading ...
test-convert-cvs.out Loading ...
test-convert-darcs Loading ...
test-convert-darcs.out Loading ...
test-convert-datesort Loading ...
test-convert-datesort.out Loading ...
test-convert-filemap Loading ...
test-convert-filemap.out Loading ...
test-convert-git Loading ...
test-convert-git.out Loading ...
test-convert-hg-sink Loading ...
test-convert-hg-sink.out Loading ...
test-convert-hg-source Loading ...
test-convert-hg-source.out Loading ...
test-convert-hg-svn Loading ...
test-convert-hg-svn.out Loading ...
test-convert-mtn Loading ...
test-convert-mtn.out Loading ...
test-convert-svn-branches Loading ...
test-convert-svn-branches.out Loading ...
test-convert-svn-move Loading ...
test-convert-svn-move.out Loading ...
test-convert-svn-sink Loading ...
test-convert-svn-sink.out Loading ...
test-convert-svn-source Loading ...
test-convert-svn-source.out Loading ...
test-convert-svn-startrev Loading ...
test-convert-svn-startrev.out Loading ...
test-convert-tla Loading ...
test-convert-tla.out Loading ...
test-convert.out Loading ...
test-copy Loading ...
test-copy-move-merge Loading ...
test-copy-move-merge.out Loading ...
test-copy.out Loading ...
test-copy2 Loading ...
test-copy2.out Loading ...
test-custom-filters Loading ...
test-custom-filters.out Loading ...
test-debugcomplete Loading ...
test-debugcomplete.out Loading ...
test-debugindexdot Loading ...
test-debugindexdot.out Loading ...
test-debugrename Loading ...
test-debugrename.out Loading ...
test-default-push Loading ...
test-default-push.out Loading ...
test-demandimport Loading ...
test-demandimport.out Loading ...
test-diff-binary-file Loading ...
test-diff-binary-file.out Loading ...
test-diff-hashes Loading ...
test-diff-hashes.out Loading ...
test-diff-ignore-whitespace Loading ...
test-diff-ignore-whitespace.out Loading ...
test-diff-newlines Loading ...
test-diff-newlines.out Loading ...
test-diff-subdir Loading ...
test-diff-subdir.out Loading ...
test-diffdir Loading ...
test-diffdir.out Loading ...
test-dispatch Loading ...
test-dispatch.out Loading ...
test-dispatch.py Loading ...
test-dispatch.py.out Loading ...
test-doctest.py Loading ...
test-double-merge Loading ...
test-double-merge.out Loading ...
test-empty Loading ...
test-empty-dir Loading ...
test-empty-dir.out Loading ...
test-empty-file Loading ...
test-empty-file.out Loading ...
test-empty-group Loading ...
test-empty-group.out Loading ...
test-empty.out Loading ...
test-encode Loading ...
test-encode.out Loading ...
test-encoding Loading ...
test-encoding.out Loading ...
test-excessive-merge Loading ...
test-excessive-merge.out Loading ...
test-execute-bit Loading ...
test-execute-bit.out Loading ...
test-export Loading ...
test-export.out Loading ...
test-extdiff Loading ...
test-extdiff.out Loading ...
test-extension Loading ...
test-extension.out Loading ...
test-extra-filelog-entry Loading ...
test-extra-filelog-entry.out Loading ...
test-fetch Loading ...
test-fetch.out Loading ...
test-filebranch Loading ...
test-filebranch.out Loading ...
test-flags Loading ...
test-flags.out Loading ...
test-git-export Loading ...
test-git-export.out Loading ...
test-git-import Loading ...
test-git-import.out Loading ...
test-globalopts Loading ...
test-globalopts.out Loading ...
test-glog Loading ...
test-glog.out Loading ...
test-grep Loading ...
test-grep.out Loading ...
test-help Loading ...
test-help.out Loading ...
test-hgignore Loading ...
test-hgignore.out Loading ...
test-hgrc Loading ...
test-hgrc.out Loading ...
test-hgweb Loading ...
test-hgweb-commands Loading ...
test-hgweb-commands.out Loading ...
test-hgweb-no-request-uri Loading ...
test-hgweb-no-request-uri.out Loading ...
test-hgweb.out Loading ...
test-hgwebdir Loading ...
test-hgwebdir.out Loading ...
test-hgwebdirsym Loading ...
test-hgwebdirsym.out Loading ...
test-highlight Loading ...
test-highlight.out Loading ...
test-hook Loading ...
test-hook.out Loading ...
test-http Loading ...
test-http-clone-r Loading ...
test-http-clone-r.out Loading ...
test-http-proxy Loading ...
test-http-proxy.out Loading ...
test-http.out Loading ...
test-hup Loading ...
test-hup.out Loading ...
test-imerge Loading ...
test-imerge.out Loading ...
test-impexp-branch Loading ...
test-impexp-branch.out Loading ...
test-import Loading ...
test-import.out Loading ...
test-incoming-outgoing Loading ...
test-incoming-outgoing.out Loading ...
test-inherit-mode Loading ...
test-inherit-mode.out Loading ...
test-init Loading ...
test-init.out Loading ...
test-install Loading ...
test-install.out Loading ...
test-issue322 Loading ...
test-issue322.out Loading ...
test-issue352 Loading ...
test-issue352.out Loading ...
test-issue433 Loading ...
test-issue433.out Loading ...
test-issue436 Loading ...
test-issue522 Loading ...
test-issue522.out Loading ...
test-issue612 Loading ...
test-issue612.out Loading ...
test-issue619 Loading ...
test-issue619.out Loading ...
test-issue660 Loading ...
test-issue660.out Loading ...
test-issue672 Loading ...
test-issue672.out Loading ...
test-issue842 Loading ...
test-issue842.out Loading ...
test-journal-exists Loading ...
test-journal-exists.out Loading ...
test-keyword Loading ...
test-keyword.hg Loading ...
test-keyword.out Loading ...
test-locate Loading ...
test-locate.out Loading ...
test-lock-badness Loading ...
test-lock-badness.out Loading ...
test-log Loading ...
test-log.out Loading ...
test-manifest Loading ...
test-manifest-merging Loading ...
test-manifest-merging.out Loading ...
test-manifest.hg Loading ...
test-manifest.out Loading ...
test-merge-commit Loading ...
test-merge-commit.out Loading ...
test-merge-default Loading ...
test-merge-default.out Loading ...
test-merge-force Loading ...
test-merge-force.out Loading ...
test-merge-local Loading ...
test-merge-local.out Loading ...
test-merge-prompt Loading ...
test-merge-prompt.out Loading ...
test-merge-remove Loading ...
test-merge-remove.out Loading ...
test-merge-revert Loading ...
test-merge-revert.out Loading ...
test-merge-revert2 Loading ...
test-merge-revert2.out Loading ...
test-merge-symlinks Loading ...
test-merge-symlinks.hg Loading ...
test-merge-symlinks.out Loading ...
test-merge-types Loading ...
test-merge-types.out Loading ...
test-merge1 Loading ...
test-merge1.out Loading ...
test-merge10 Loading ...
test-merge10.out Loading ...
test-merge2 Loading ...
test-merge2.out Loading ...
test-merge3 Loading ...
test-merge3.out Loading ...
test-merge4 Loading ...
test-merge4.out Loading ...
test-merge5 Loading ...
test-merge5.out Loading ...
test-merge6 Loading ...
test-merge6.out Loading ...
test-merge7 Loading ...
test-merge7.out Loading ...
test-merge8 Loading ...
test-merge8.out Loading ...
test-merge9 Loading ...
test-merge9.out Loading ...
test-mq Loading ...
test-mq-caches Loading ...
test-mq-caches.out Loading ...
test-mq-guards Loading ...
test-mq-guards.out Loading ...
test-mq-header-date Loading ...
test-mq-header-date.out Loading ...
test-mq-header-from Loading ...
test-mq-header-from.out Loading ...
test-mq-merge Loading ...
test-mq-merge.out Loading ...
test-mq-missingfiles Loading ...
test-mq-missingfiles.out Loading ...
test-mq-pull-from-bundle Loading ...
test-mq-pull-from-bundle.out Loading ...
test-mq-qclone-http Loading ...
test-mq-qclone-http.out Loading ...
test-mq-qdelete Loading ...
test-mq-qdelete.out Loading ...
test-mq-qdiff Loading ...
test-mq-qdiff.out Loading ...
test-mq-qgoto Loading ...
test-mq-qgoto.out Loading ...
test-mq-qimport Loading ...
test-mq-qimport.out Loading ...
test-mq-qnew-twice Loading ...
test-mq-qnew-twice.out Loading ...
test-mq-qpush-fail Loading ...
test-mq-qpush-fail.out Loading ...
test-mq-qrefresh Loading ...
test-mq-qrefresh-replace-log-message Loading ...
test-mq-qrefresh-replace-log-message.out Loading ...
test-mq-qrefresh.out Loading ...
test-mq-qrename Loading ...
test-mq-qrename.out Loading ...
test-mq-qsave Loading ...
test-mq-qsave.out Loading ...
test-mq-safety Loading ...
test-mq-safety.out Loading ...
test-mq-symlinks Loading ...
test-mq-symlinks.out Loading ...
test-mq.out Loading ...
test-mv-cp-st-diff Loading ...
test-mv-cp-st-diff.out Loading ...
test-nested-repo Loading ...
test-nested-repo.out Loading ...
test-newbranch Loading ...
test-newbranch.out Loading ...
test-newcgi Loading ...
test-newcgi.out Loading ...
test-newercgi Loading ...
test-newercgi.out Loading ...
test-no-symlinks Loading ...
test-no-symlinks.hg Loading ...
test-no-symlinks.out Loading ...
test-non-interactive-wsgi Loading ...
test-non-interactive-wsgi.out Loading ...
test-notify Loading ...
test-notify.out Loading ...
test-oldcgi Loading ...
test-oldcgi.out Loading ...
test-parentrevspec Loading ...
test-parentrevspec.out Loading ...
test-parents Loading ...
test-parents.out Loading ...
test-parse-date Loading ...
test-parse-date.out Loading ...
test-parseindex Loading ...
test-parseindex.out Loading ...
test-patch Loading ...
test-patch.out Loading ...
test-patchbomb Loading ...
test-patchbomb.out Loading ...
test-paths Loading ...
test-paths.out Loading ...
test-permissions Loading ...
test-permissions.out Loading ...
test-profile Loading ...
test-profile.out Loading ...
test-pull Loading ...
test-pull-permission Loading ...
test-pull-permission.out Loading ...
test-pull-pull-corruption Loading ...
test-pull-pull-corruption.out Loading ...
test-pull-pull-corruption2 Loading ...
test-pull-pull-corruption2.out Loading ...
test-pull-r Loading ...
test-pull-r.out Loading ...
test-pull-update Loading ...
test-pull-update.out Loading ...
test-pull.out Loading ...
test-purge Loading ...
test-purge.out Loading ...
test-push-hook-lock Loading ...
test-push-hook-lock.out Loading ...
test-push-http Loading ...
test-push-http.out Loading ...
test-push-r Loading ...
test-push-r.out Loading ...
test-push-warn Loading ...
test-push-warn.out Loading ...
test-qrecord Loading ...
test-qrecord.out Loading ...
test-race Loading ...
test-race.out Loading ...
test-rawcommit1 Loading ...
test-rawcommit1.out Loading ...
test-rebuildstate Loading ...
test-rebuildstate.out Loading ...
test-record Loading ...
test-record.out Loading ...
test-remove Loading ...
test-remove.out Loading ...
test-rename Loading ...
test-rename-after-merge Loading ...
test-rename-after-merge.out Loading ...
test-rename-dir-merge Loading ...
test-rename-dir-merge.out Loading ...
test-rename-dir-merge2 Loading ...
test-rename-dir-merge2.out Loading ...
test-rename-merge1 Loading ...
test-rename-merge1.out Loading ...
test-rename-merge2 Loading ...
test-rename-merge2.out Loading ...
test-rename.out Loading ...
test-requires Loading ...
test-requires.out Loading ...
test-revert Loading ...
test-revert-flags Loading ...
test-revert-flags.out Loading ...
test-revert-unknown Loading ...
test-revert-unknown.out Loading ...
test-revert.out Loading ...
test-revlog-packentry Loading ...
test-revlog-packentry.out Loading ...
test-rollback Loading ...
test-rollback.out Loading ...
test-serve Loading ...
test-serve.out Loading ...
test-simple-update Loading ...
test-simple-update.out Loading ...
test-simplemerge-cmd Loading ...
test-simplemerge-cmd.out Loading ...
test-simplemerge.py Loading ...
test-simplemerge.py.out Loading ...
test-ssh Loading ...
test-ssh-clone-r Loading ...
test-ssh-clone-r.out Loading ...
test-ssh.out Loading ...
test-static-http Loading ...
test-static-http.out Loading ...
test-status Loading ...
test-status.out Loading ...
test-strict Loading ...
test-strict.out Loading ...
test-strip-cross Loading ...
test-strip-cross.out Loading ...
test-symlink-basic Loading ...
test-symlink-basic.out Loading ...
test-symlink-root Loading ...
test-symlink-root.out Loading ...
test-symlinks Loading ...
test-symlinks.out Loading ...
test-tag Loading ...
test-tag.out Loading ...
test-tags Loading ...
test-tags.out Loading ...
test-transplant Loading ...
test-transplant.out Loading ...
test-trusted.py Loading ...
test-trusted.py.out Loading ...
test-ui-config Loading ...
test-ui-config.out Loading ...
test-ui-verbosity Loading ...
test-ui-verbosity.out Loading ...
test-unrelated-pull Loading ...
test-unrelated-pull.out Loading ...
test-up-local-change Loading ...
test-up-local-change.out Loading ...
test-update-reverse Loading ...
test-update-reverse.out Loading ...
test-url-rev Loading ...
test-url-rev.out Loading ...
test-walk Loading ...
test-walk.out Loading ...
test-walkrepo.py Loading ...
test-webraw Loading ...
test-webraw.out Loading ...
test-win32text Loading ...
test-win32text.out Loading ...
tinyproxy.py Loading ...

To run the tests, do:

cd tests/
python run-tests.py

See http://www.selenic.com/mercurial/wiki/index.cgi/WritingTests for
more information on writing tests.