← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-updates

~ubuntu-branches/ubuntu/intrepid/git-core/intrepid-updates

« back to all changes in this revision

Viewing changes to t/t5100/patch0008

Committer: Package Import Robot
Author(s): Gerrit Pape
Date: 2007-04-22 13:31:05 UTC
mto: This revision was merged to the branch mainline in revision 20.
Revision ID: package-import@ubuntu.com-20070422133105-xg8fnm18r2cxcbg1

Tags: upstream-1.5.1.2

Import upstream version 1.5.1.2

files added:
.mailmap

Documentation/RelNotes-1.5.0.1.txt

Documentation/RelNotes-1.5.0.2.txt

Documentation/RelNotes-1.5.0.3.txt

Documentation/RelNotes-1.5.0.4.txt

Documentation/RelNotes-1.5.0.5.txt

Documentation/RelNotes-1.5.0.6.txt

Documentation/RelNotes-1.5.0.7.txt

Documentation/RelNotes-1.5.0.txt

Documentation/RelNotes-1.5.1.1.txt

Documentation/RelNotes-1.5.1.2.txt

Documentation/RelNotes-1.5.1.txt

Documentation/blame-options.txt

Documentation/cmd-list.perl

Documentation/core-intro.txt

Documentation/docbook-xsl.css

Documentation/git-bundle.txt

Documentation/git-config.txt

Documentation/git-fast-import.txt

Documentation/git-fsck.txt

Documentation/git-gc.txt

Documentation/git-init.txt

Documentation/git-merge-file.txt

Documentation/git-mergetool.txt

Documentation/git-reflog.txt

Documentation/git-remote.txt

Documentation/howto/dangling-objects.txt

Documentation/howto/use-git-daemon.txt

Documentation/i18n.txt

Documentation/install-doc-quick.sh

Documentation/technical/send-pack-pipeline.txt

Documentation/technical/shallow.txt

Documentation/user-manual.conf

Documentation/user-manual.txt

RelNotes

builtin-bundle.c

builtin-config.c

builtin-describe.c

builtin-fetch--tool.c

builtin-fsck.c

builtin-gc.c

builtin-merge-base.c

builtin-merge-file.c

builtin-reflog.c

builtin-rerere.c

builtin-revert.c

builtin-shortlog.c

compat/pread.c

compat/strtoumax.c

contrib/blameview

contrib/blameview/README

contrib/blameview/blameview.perl

contrib/continuous

contrib/continuous/cidaemon

contrib/continuous/post-receive-cinotify

contrib/emacs/git-blame.el

contrib/examples

contrib/examples/git-gc.sh

contrib/examples/git-resolve.sh

contrib/fast-import

contrib/fast-import/import-tars.perl

contrib/hg-to-git

contrib/hg-to-git/hg-to-git.py

contrib/hg-to-git/hg-to-git.txt

contrib/hooks

contrib/hooks/post-receive-email

contrib/workdir

contrib/workdir/git-new-workdir

convert.c

fast-import.c

git-add--interactive.perl

git-gui

git-gui/.gitignore

git-gui/GIT-VERSION-GEN

git-gui/Makefile

git-gui/git-gui.sh

git-gui/version

git-mergetool.sh

git-remote.perl

gitweb/INSTALL

perl/Makefile

reachable.c

reachable.h

reflog-walk.c

reflog-walk.h

shallow.c

t/t0020-crlf.sh

t/t1410-reflog.sh

t/t2005-checkout-index-symlinks.sh

t/t2102-update-index-symlinks.sh

t/t3501-revert-cherry-pick.sh

t/t3900

t/t3900-i18n-commit.sh

t/t3900/1-UTF-8.txt

t/t3900/2-UTF-8.txt

t/t3900/EUCJP.txt

t/t3900/ISO-2022-JP.txt

t/t3900/ISO-8859-1.txt

t/t3901-8859-1.txt

t/t3901-i18n-patch.sh

t/t3901-utf8.txt

t/t4013/diff.format-patch_--inline_--stdout_initial..master

t/t4013/diff.format-patch_--inline_--stdout_initial..master^

t/t4013/diff.format-patch_--inline_--stdout_initial..side

t/t4016-diff-quote.sh

t/t4017-diff-retval.sh

t/t4017-quiet.sh

t/t4119-apply-config.sh

t/t4120-apply-popt.sh

t/t4121-apply-diffs.sh

t/t4200-rerere.sh

t/t5100/info0006

t/t5100/info0007

t/t5100/info0008

t/t5100/msg0006

t/t5100/msg0007

t/t5100/msg0008

t/t5100/patch0006

t/t5100/patch0007

t/t5100/patch0008

t/t5301-sliding-window.sh

t/t5401-update-hooks.sh

t/t5515

t/t5515-fetch-merge-logic.sh

t/t5515/fetch.br-branches-default

t/t5515/fetch.br-branches-default-merge

t/t5515/fetch.br-branches-default-merge_branches-default

t/t5515/fetch.br-branches-default-octopus

t/t5515/fetch.br-branches-default-octopus_branches-default

t/t5515/fetch.br-branches-default_branches-default

t/t5515/fetch.br-branches-one

t/t5515/fetch.br-branches-one-merge

t/t5515/fetch.br-branches-one-merge_branches-one

t/t5515/fetch.br-branches-one-octopus

t/t5515/fetch.br-branches-one-octopus_branches-one

t/t5515/fetch.br-branches-one_branches-one

t/t5515/fetch.br-config-explicit

t/t5515/fetch.br-config-explicit-merge

t/t5515/fetch.br-config-explicit-merge_config-explicit

t/t5515/fetch.br-config-explicit-octopus

t/t5515/fetch.br-config-explicit-octopus_config-explicit

t/t5515/fetch.br-config-explicit_config-explicit

t/t5515/fetch.br-config-glob

t/t5515/fetch.br-config-glob-merge

t/t5515/fetch.br-config-glob-merge_config-glob

t/t5515/fetch.br-config-glob-octopus

t/t5515/fetch.br-config-glob-octopus_config-glob

t/t5515/fetch.br-config-glob_config-glob

t/t5515/fetch.br-remote-explicit

t/t5515/fetch.br-remote-explicit-merge

t/t5515/fetch.br-remote-explicit-merge_remote-explicit

t/t5515/fetch.br-remote-explicit-octopus

t/t5515/fetch.br-remote-explicit-octopus_remote-explicit

t/t5515/fetch.br-remote-explicit_remote-explicit

t/t5515/fetch.br-remote-glob

t/t5515/fetch.br-remote-glob-merge

t/t5515/fetch.br-remote-glob-merge_remote-glob

t/t5515/fetch.br-remote-glob-octopus

t/t5515/fetch.br-remote-glob-octopus_remote-glob

t/t5515/fetch.br-remote-glob_remote-glob

t/t5515/fetch.br-unconfig

t/t5515/fetch.br-unconfig_--tags_.._.git

t/t5515/fetch.br-unconfig_.._.git

t/t5515/fetch.br-unconfig_.._.git_one

t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file

t/t5515/fetch.br-unconfig_.._.git_one_two

t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file

t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three

t/t5515/fetch.br-unconfig_branches-default

t/t5515/fetch.br-unconfig_branches-one

t/t5515/fetch.br-unconfig_config-explicit

t/t5515/fetch.br-unconfig_config-glob

t/t5515/fetch.br-unconfig_remote-explicit

t/t5515/fetch.br-unconfig_remote-glob

t/t5515/fetch.master

t/t5515/fetch.master_--tags_.._.git

t/t5515/fetch.master_.._.git

t/t5515/fetch.master_.._.git_one

t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file

t/t5515/fetch.master_.._.git_one_two

t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file

t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three

t/t5515/fetch.master_branches-default

t/t5515/fetch.master_branches-one

t/t5515/fetch.master_config-explicit

t/t5515/fetch.master_config-glob

t/t5515/fetch.master_remote-explicit

t/t5515/fetch.master_remote-glob

t/t6005-rev-list-count.sh

t/t6006-rev-list-format.sh

t/t6023-merge-file.sh

t/t6023-merge-rename-nocruft.sh

t/t6024-recursive-merge.sh

t/t6025-merge-symlinks.sh

t/t6030-bisect-run.sh

t/t6120-describe.sh

t/t9107-git-svn-migrate.sh

t/t9108-git-svn-glob.sh

t/t9110

t/t9110-git-svn-use-svm-props.sh

t/t9110/svm.dump

t/t9111

t/t9111-git-svn-use-svnsync-props.sh

t/t9111/svnsync.dump

t/t9300-fast-import.sh

templates/hooks--post-receive

test-chmtime.c

utf8.c

utf8.h

xdiff/xmerge.c

files removed:
Documentation/git-diff-stages.txt

Documentation/git-resolve.txt

Documentation/sort_glossary.pl

builtin-diff-stages.c

builtin-repo-config.c

compat/subprocess.py

contrib/colordiff

contrib/colordiff/README

contrib/colordiff/colordiff.perl

describe.c

fsck-objects.c

git-merge-recursive-old.py

git-rerere.perl

git-resolve.sh

git-revert.sh

git-shortlog.perl

gitMergeCommon.py

merge-base.c

t/t9103-git-svn-graft-branches.sh

templates/remotes--

files modified:
.gitignore

Documentation/.gitignore

Documentation/Makefile

Documentation/SubmittingPatches

Documentation/build-docdep.perl

Documentation/callouts.xsl

Documentation/config.txt

Documentation/core-tutorial.txt

Documentation/cvs-migration.txt

Documentation/diff-format.txt

Documentation/diff-options.txt

Documentation/diffcore.txt

Documentation/everyday.txt

Documentation/fetch-options.txt

Documentation/git-add.txt

Documentation/git-am.txt

Documentation/git-annotate.txt

Documentation/git-apply.txt

Documentation/git-applymbox.txt

Documentation/git-applypatch.txt

Documentation/git-archimport.txt

Documentation/git-archive.txt

Documentation/git-bisect.txt

Documentation/git-blame.txt

Documentation/git-branch.txt

Documentation/git-cat-file.txt

Documentation/git-checkout-index.txt

Documentation/git-checkout.txt

Documentation/git-cherry-pick.txt

Documentation/git-clone.txt

Documentation/git-commit-tree.txt

Documentation/git-commit.txt

Documentation/git-count-objects.txt

Documentation/git-cvsexportcommit.txt

Documentation/git-cvsimport.txt

Documentation/git-cvsserver.txt

Documentation/git-daemon.txt

Documentation/git-describe.txt

Documentation/git-diff-files.txt

Documentation/git-diff.txt

Documentation/git-fetch-pack.txt

Documentation/git-fetch.txt

Documentation/git-for-each-ref.txt

Documentation/git-format-patch.txt

Documentation/git-fsck-objects.txt

Documentation/git-grep.txt

Documentation/git-hash-object.txt

Documentation/git-http-fetch.txt

Documentation/git-http-push.txt

Documentation/git-init-db.txt

Documentation/git-instaweb.txt

Documentation/git-local-fetch.txt

Documentation/git-log.txt

Documentation/git-lost-found.txt

Documentation/git-ls-files.txt

Documentation/git-ls-remote.txt

Documentation/git-ls-tree.txt

Documentation/git-mailinfo.txt

Documentation/git-mailsplit.txt

Documentation/git-merge-base.txt

Documentation/git-merge-index.txt

Documentation/git-merge-one-file.txt

Documentation/git-merge.txt

Documentation/git-mv.txt

Documentation/git-name-rev.txt

Documentation/git-p4import.txt

Documentation/git-pack-redundant.txt

Documentation/git-pack-refs.txt

Documentation/git-parse-remote.txt

Documentation/git-patch-id.txt

Documentation/git-peek-remote.txt

Documentation/git-prune-packed.txt

Documentation/git-prune.txt

Documentation/git-pull.txt

Documentation/git-push.txt

Documentation/git-quiltimport.txt

Documentation/git-read-tree.txt

Documentation/git-rebase.txt

Documentation/git-receive-pack.txt

Documentation/git-repack.txt

Documentation/git-repo-config.txt

Documentation/git-rerere.txt

Documentation/git-reset.txt

Documentation/git-rev-list.txt

Documentation/git-rev-parse.txt

Documentation/git-revert.txt

Documentation/git-rm.txt

Documentation/git-runstatus.txt

Documentation/git-send-email.txt

Documentation/git-send-pack.txt

Documentation/git-sh-setup.txt

Documentation/git-shell.txt

Documentation/git-shortlog.txt

Documentation/git-show-branch.txt

Documentation/git-show-ref.txt

Documentation/git-show.txt

Documentation/git-ssh-fetch.txt

Documentation/git-ssh-upload.txt

Documentation/git-status.txt

Documentation/git-svn.txt

Documentation/git-svnimport.txt

Documentation/git-symbolic-ref.txt

Documentation/git-tag.txt

Documentation/git-tar-tree.txt

Documentation/git-tools.txt

Documentation/git-update-index.txt

Documentation/git-update-ref.txt

Documentation/git-upload-archive.txt

Documentation/git-upload-pack.txt

Documentation/git-var.txt

Documentation/git-whatchanged.txt

Documentation/git-write-tree.txt

Documentation/git.txt

Documentation/gitk.txt

Documentation/glossary.txt

Documentation/hooks.txt

Documentation/howto/rebase-from-internal-branch.txt

Documentation/howto/revert-branch-rebase.txt

Documentation/howto/setup-git-server-over-http.txt

Documentation/install-webdoc.sh

Documentation/pretty-formats.txt

Documentation/pull-fetch-param.txt

Documentation/repository-layout.txt

Documentation/technical/pack-format.txt

Documentation/technical/racy-git.txt

Documentation/tutorial-2.txt

Documentation/tutorial.txt

Documentation/urls.txt

GIT-VERSION-GEN

INSTALL

Makefile

README

archive-tar.c

archive-zip.c

base85.c

blob.c

builtin-add.c

builtin-annotate.c

builtin-apply.c

builtin-archive.c

builtin-blame.c

builtin-branch.c

builtin-cat-file.c

builtin-checkout-index.c

builtin-commit-tree.c

builtin-count-objects.c

builtin-diff-files.c

builtin-diff-index.c

builtin-diff-tree.c

builtin-diff.c

builtin-fmt-merge-msg.c

builtin-for-each-ref.c

builtin-grep.c

builtin-init-db.c

builtin-log.c

builtin-ls-files.c

builtin-ls-tree.c

builtin-mailinfo.c

builtin-mailsplit.c

builtin-mv.c

builtin-name-rev.c

builtin-pack-objects.c

builtin-pack-refs.c

builtin-prune-packed.c

builtin-prune.c

builtin-push.c

builtin-read-tree.c

builtin-rev-list.c

builtin-rev-parse.c

builtin-rm.c

builtin-runstatus.c

builtin-show-branch.c

builtin-show-ref.c

builtin-stripspace.c

builtin-symbolic-ref.c

builtin-tar-tree.c

builtin-unpack-objects.c

builtin-update-index.c

builtin-update-ref.c

builtin-upload-archive.c

builtin-verify-pack.c

builtin-write-tree.c

builtin.h

cache.h

color.c

combine-diff.c

commit.c

commit.h

compat/inet_ntop.c

compat/mmap.c

compat/setenv.c

compat/strlcpy.c

compat/unsetenv.c

config.c

config.mak.in

configure.ac

connect.c

contrib/completion/git-completion.bash

contrib/emacs/Makefile

contrib/emacs/git.el

contrib/emacs/vc-git.el

contrib/gitview/gitview

contrib/remotes2config.sh

contrib/vim/syntax/gitcommit.vim

convert-objects.c

daemon.c

date.c

diff-delta.c

diff-lib.c

diff.c

diff.h

diffcore-break.c

diffcore-order.c

diffcore-pickaxe.c

diffcore-rename.c

diffcore.h

dir.c

dir.h

entry.c

environment.c

exec_cmd.c

fetch-pack.c

fetch.c

generate-cmdlist.sh

git-am.sh

git-applymbox.sh

git-archimport.perl

git-bisect.sh

git-checkout.sh

git-clean.sh

git-clone.sh

git-commit.sh

git-compat-util.h

git-cvsexportcommit.perl

git-cvsimport.perl

git-cvsserver.perl

git-fetch.sh

git-instaweb.sh

git-lost-found.sh

git-ls-remote.sh

git-merge-one-file.sh

git-merge-ours.sh

git-merge-resolve.sh

git-merge.sh

git-p4import.py

git-parse-remote.sh

git-pull.sh

git-quiltimport.sh

git-rebase.sh

git-repack.sh

git-request-pull.sh

git-reset.sh

git-send-email.perl

git-sh-setup.sh

git-svn.perl

git-svnimport.perl

git-tag.sh

git-verify-tag.sh

git.c

git.spec

git.spec.in

gitk

gitweb/gitweb.css

gitweb/gitweb.perl

grep.c

hash-object.c

help.c

http-fetch.c

http-push.c

http.h

ident.c

imap-send.c

index-pack.c

interpolate.c

interpolate.h

list-objects.c

local-fetch.c

lockfile.c

log-tree.c

merge-file.c

merge-index.c

merge-recursive.c

merge-tree.c

mktag.c

mktree.c

object.c

object.h

pack-check.c

pack-redundant.c

pack.h

pager.c

patch-delta.c

path-list.c

path.c

peek-remote.c

perl/.gitignore

perl/Git.pm

perl/Makefile.PL

perl/private-Error.pm

pkt-line.c

ppc/sha1ppc.S

quote.c

quote.h

read-cache.c

receive-pack.c

refs.c

refs.h

revision.c

revision.h

rsh.c

run-command.c

run-command.h

send-pack.c

server-info.c

setup.c

sha1_file.c

sha1_name.c

shell.c

ssh-fetch.c

ssh-upload.c

strbuf.c

t/Makefile

t/README

t/annotate-tests.sh

t/diff-lib.sh

t/lib-git-svn.sh

t/t0000-basic.sh

t/t1000-read-tree-m-3way.sh

t/t1001-read-tree-m-2way.sh

t/t1002-read-tree-m-u-2way.sh

t/t1004-read-tree-m-u-wf.sh

t/t1020-subdirectory.sh

t/t1200-tutorial.sh

t/t1300-repo-config.sh

t/t1400-update-ref.sh

t/t3001-ls-files-others-exclude.sh

t/t3002-ls-files-dashpath.sh

t/t3100-ls-tree-restrict.sh

t/t3101-ls-tree-dirname.sh

t/t3200-branch.sh

t/t3210-pack-refs.sh

t/t3300-funny-names.sh

t/t3600-rm.sh

t/t3700-add.sh

t/t3800-mktag.sh

t/t4000-diff-format.sh

t/t4006-diff-mode.sh

t/t4013-diff-various.sh

t/t4013/diff.format-patch_--attach_--stdout_initial..master

t/t4013/diff.format-patch_--attach_--stdout_initial..master^

t/t4013/diff.format-patch_--attach_--stdout_initial..side

t/t4013/diff.format-patch_--stdout_initial..master

t/t4013/diff.format-patch_--stdout_initial..master^

t/t4013/diff.format-patch_--stdout_initial..side

t/t4015-diff-whitespace.sh

t/t4100-apply-stat.sh

t/t4102-apply-rename.sh

t/t4104-apply-boundary.sh

t/t4115-apply-symlink.sh

t/t4116-apply-reverse.sh

t/t4117-apply-reject.sh

t/t4118-apply-empty-context.sh

t/t5000-tar-tree.sh

t/t5100-mailinfo.sh

t/t5100/sample.mbox

t/t5300-pack-object.sh

t/t5400-send-pack.sh

t/t5500-fetch-pack.sh

t/t5510-fetch.sh

t/t5520-pull.sh

t/t5600-clone-fail-cleanup.sh

t/t5700-clone-reference.sh

t/t5710-info-alternate.sh

t/t6200-fmt-merge-msg.sh

t/t7001-mv.sh

t/t7201-co.sh

t/t9100-git-svn-basic.sh

t/t9101-git-svn-props.sh

t/t9102-git-svn-deep-rmdir.sh

t/t9104-git-svn-follow-parent.sh

t/t9105-git-svn-commit-diff.sh

t/t9106-git-svn-commit-diff-clobber.sh

t/t9200-git-cvsexportcommit.sh

t/test-lib.sh

tag.c

templates/Makefile

templates/hooks--commit-msg

templates/hooks--update

test-date.c

test-delta.c

trace.c

tree-diff.c

tree-walk.c

tree-walk.h

tree.c

unpack-file.c

unpack-trees.c

unpack-trees.h

upload-pack.c

usage.c

var.c

version

write_or_die.c

wt-status.c

wt-status.h

xdiff-interface.c

xdiff-interface.h

xdiff/xdiff.h

xdiff/xdiffi.c

xdiff/xdiffi.h

xdiff/xutils.c

Show diffs side-by-side

added added

removed removed

t/t5100/patch0008

Older »