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
..
help	docs: update to correctly reflect that local git repositories are supported	2012-09-13 20:57:37 -04:00
__init__.py	testedwith: drop 2.3.1, which has at least one test failure	2013-12-14 11:59:39 -05:00
_ssh.py	Upgraded to use latest version of dulwich (0.9.1).	2013-09-13 01:42:27 +01:00
git_handler.py	git_handler: don't bail on multiple octopus merges in succession	2014-02-11 22:13:34 -08:00
gitdirstate.py	gitdirstate: import errno for handling OSError	2014-02-07 10:43:49 -05:00
gitrepo.py	listkeys: simplify ref stripping expression	2012-10-28 20:32:42 -04:00
hg2git.py	Only export modified Git trees	2013-04-14 11:11:41 -07:00
hgrepo.py	push: return 1 if no changes found, 0 if success	2012-09-05 23:27:31 -04:00
overlay.py	overlay: add kludge to make sure we only ever give hexshas to dulwich	2013-12-13 12:54:39 -05:00
util.py	submodules: only use the ordereddict backport if collections.OrderedDict is unavailable	2012-08-28 09:09:01 -05:00