2 commits

Author	SHA1	Message	Date
Michael Contreras	e234ac9d47	git-svn: avoid self-referencing mergeinfo ... When svn.pushmergeinfo is set, the target branch is included in the mergeinfo if it was previously merged into one of the source branches. SVN does not do this. Remove merge target branch path from resulting mergeinfo when svn.pushmergeinfo is set to better match the behavior of SVN. Update the svn-mergeinfo-push test. [ew: 80 columns] Signed-off-by: Michael Contreras <michael@inetric.com> Reported-by: Avishay Lavie <avishay.lavie@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>	2013-05-09 01:07:39 +00:00
Frédéric Heitzmann	26e4266f2f	Disambiguate duplicate t9160* tests ... 1e5814f created t9160-git-svn-mergeinfo-push.sh on 11/9/7 40a1530 created t9160-git-svn-preserve-empty-dirs.sh on 11/7/20 The former test script is renumbered to t9161. Signed-off-by: Frédéric Heitzmann <frederic.heitzmann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2011-09-16 14:06:19 -07:00

Renamed from t/t9160-git-svn-mergeinfo-push.sh (Browse further)