backport.pl conflicts mode: Add an XFail regression test.
backport.pl conflicts mode: Add an XFail regression test.

Found by: rhuijben

* tools/dist/backport_tests.py
  (make_entry, serialize_entry): Add 'depends' parameter.
  (backport_conflicts_detection): Extend test.
  (backport_double_conflict): New XFail test.

git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1662756 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion