Pierre-Yves David 6652b6ffb3 rebase: fix selection of base used when rebasing merge (issue4041) ... Prior this changeset, rebasing a merge whose first parent was not in the rebase lead to wrong and highly conflicting merge. See the in-line comment for details. Test have been updated with the data provided by the reported.		2013-10-30 19:45:14 +01:00
..
darcs1.hg	tests: move test bundles in a bundles/ subdirectory	2011-04-30 17:38:06 +02:00
hgweb+obs.hg	hgweb: add test regarding filtering and hgweb	2013-01-16 11:39:22 -06:00
issue4041.hg	rebase: fix selection of base used when rebasing merge (issue4041)	2013-10-30 19:45:14 +01:00
legacy-encoding.hg	tests: move test bundles in a bundles/ subdirectory	2011-04-30 17:38:06 +02:00
rebase-revset.hg	rebase: add --rev option to rebase	2011-10-15 20:12:32 +02:00
rebase.hg	tests: upgrade bundles/rebase.hg to support test-rebase-collapse	2011-04-30 17:38:06 +02:00
rebase.sh	tests: upgrade bundles/rebase.hg to support test-rebase-collapse	2011-04-30 17:38:06 +02:00
remote.hg	tests: create a bundle to bootstrap tests using a remote repository	2011-04-30 17:38:06 +02:00
remote.sh	tests: create a bundle to bootstrap tests using a remote repository	2011-04-30 17:38:06 +02:00
rename.sh	localrepo: add setparents() to adjust dirstate copies (issue3407)	2012-04-29 22:25:55 +02:00
renames.hg	localrepo: add setparents() to adjust dirstate copies (issue3407)	2012-04-29 22:25:55 +02:00
tampered.hg	tests: move test bundles in a bundles/ subdirectory	2011-04-30 17:38:06 +02:00
test-invalid-branch-name.hg	update: allow update to existing branches with invalid names (issue3710)	2012-11-27 08:47:35 -05:00
test-keyword.hg	tests: move test bundles in a bundles/ subdirectory	2011-04-30 17:38:06 +02:00
test-manifest.hg	tests: move test bundles in a bundles/ subdirectory	2011-04-30 17:38:06 +02:00
test-merge-symlinks.hg	tests: move test bundles in a bundles/ subdirectory	2011-04-30 17:38:06 +02:00
test-no-symlinks.hg	tests: move test bundles in a bundles/ subdirectory	2011-04-30 17:38:06 +02:00