Siddharth Agarwal a06bbdeeac git_handler: don't bail on multiple octopus merges in succession ... Consider two octopus merges, one of which is a child of the other. Without this patch, get_git_parents() called on the second octopus merge checks that each p1 is neither in the middle of an octopus merge nor the end of it. Since the end of the first octopus merge is a p1 of the second one, this asserts. Change the sanity check to only make sure that p1 is not in the middle of an octopus merge.		2014-02-11 22:13:34 -08:00
..
hghave	tests: pull in hghave	2012-10-28 21:05:51 -04:00
hghave.py	tests: pull in hghave	2012-10-28 21:05:51 -04:00
latin-1-encoding	tests: use fn_git_commit in test-encoding.t	2012-11-03 22:36:13 -04:00
run-tests.py	tests: upgrade run-tests.py	2012-09-10 00:24:47 -04:00
test-bookmark-workflow.t	tests: extract git command-line client and dulwich requirements into testutil	2012-11-03 19:11:50 -04:00
test-branch-bookmark-suffix.t	Fixes #54 | option branch_bookmark_suffix doesn't move bookmarks along	2013-07-01 16:04:53 -03:00
test-clone.t	git-handler: turn refs from None to {} so that empty git repos can convert	2013-12-03 16:55:17 -05:00
test-conflict-1.t	push: add more output about what was added (issue #64)	2013-01-06 01:46:57 -05:00
test-conflict-2.t	push: add more output about what was added (issue #64)	2013-01-06 01:46:57 -05:00
test-convergedmerge.t	push: add more output about what was added (issue #64)	2013-01-06 01:46:57 -05:00
test-empty-working-tree.t	push: add more output about what was added (issue #64)	2013-01-06 01:46:57 -05:00
test-encoding.t	push: add more output about what was added (issue #64)	2013-01-06 01:46:57 -05:00
test-file-removal.t	push: add more output about what was added (issue #64)	2013-01-06 01:46:57 -05:00
test-git-clone.t	tests: convert echos to comments	2012-11-03 19:14:17 -04:00
test-git-submodules.t	tests: convert echos to comments	2012-11-03 19:14:17 -04:00
test-git-tags.t	tests: dulwich is now smarter about sending fewer objects, update output	2013-12-13 12:41:41 -05:00
test-git-workflow.t	tests: convert echos to comments	2012-11-03 19:14:17 -04:00
test-gitignore.t	gitignore: gate feature on dirstate having rootcache and ignore having readpats	2013-12-14 11:19:25 -05:00
test-help.t	tests: extract extension configuration into a testutil library	2012-10-30 20:03:26 -04:00
test-hg-author.t	tests: dulwich is now smarter about sending fewer objects, update output	2013-12-13 12:41:41 -05:00
test-hg-branch.t	tests: dulwich is now smarter about sending fewer objects, update output	2013-12-13 12:41:41 -05:00
test-hg-tags-invalid.t	tests: dulwich is now smarter about sending fewer objects, update output	2013-12-13 12:41:41 -05:00
test-hg-tags.t	tests: dulwich is now smarter about sending fewer objects, update output	2013-12-13 12:41:41 -05:00
test-incoming.t	tests: remove mercurial version check from test-incoming.t	2012-11-03 19:20:52 -04:00
test-keywords.t	tests: extract git command-line client and dulwich requirements into testutil	2012-11-03 19:11:50 -04:00
test-merge.t	push: add more output about what was added (issue #64)	2013-01-06 01:46:57 -05:00
test-octopus.t	git_handler: don't bail on multiple octopus merges in succession	2014-02-11 22:13:34 -08:00
test-outgoing.t	tests: fix output expectations from 3ff09f0	2013-12-15 15:25:31 -05:00
test-pull-after-strip.t	tests: remove mercurial version check from test-pull-after-strip.t	2012-11-03 19:20:39 -04:00
test-pull.t	tests: extract git command-line client and dulwich requirements into testutil	2012-11-03 19:11:50 -04:00
test-push-r.t	tests: extract git command-line client and dulwich requirements into testutil	2012-11-03 19:11:50 -04:00
test-push.t	tests: fix output expectations from 3ff09f0	2013-12-15 15:25:31 -05:00
test-subrepos.t	test-subrepos.t: hide output from newer hg versions about active bookmarks	2013-12-14 12:00:09 -05:00
test-timezone.t	test-timezone.t: add missing (but needed) trailing whitespace	2013-12-13 12:42:55 -05:00
test-tree-decomposition.t	test-tree-decomposition: work around git command format changes	2013-08-28 11:27:13 -04:00
test-url-parsing.py	tests: add check for dulwich in test-url-parsing.py	2012-10-30 23:16:07 -04:00
test-url-parsing.py.out	test-url-parsing.py: add a test for a username that starts with a number	2012-04-20 21:16:32 -05:00
testutil	tests: use fn_git_commit in test-encoding.t	2012-11-03 22:36:13 -04:00