subversion-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Hudson Server <hud...@hudson.zones.apache.org>
Subject Build failed in Hudson: subversion-trunk-ubuntu #421
Date Tue, 02 Mar 2010 01:21:12 GMT
See <http://hudson.zones.apache.org/hudson/job/subversion-trunk-ubuntu/421/changes>

Changes:

[pburba] Fix issue #3591 'reintegrate merges update subtree mergeinfo
unconditionally'.

Now --reintegrate merges behave like "regular" merge tracking merges when it
comes to recording mergeinfo on subtrees; only the subtrees affected by the
merge are updated now.

* subversion/libsvn_client/merge.c

  (notification_receiver_baton_t): Document the cases in which some members
   are NULL.

  (notification_receiver): Start keeping track of paths changed, added,
   skipped, or tree conflicted during a reintegrate merge.

  (do_merge): Add some new arguments allowing the caller to know what
   subtrees were affected by a merge or to limit what paths a --record-only
   merge will update.

  (merge_cousins_and_supplement_mergeinfo): Update calls to do_merge() such
   that --reintegrate merges only update subtree mergeinfo on paths affected
   by the merge.

  (svn_client_merge3,
   svn_client_merge_peg3): Update calls to do_merge(), maintaining previous
   behavior.

* subversion/tests/cmdline/merge_tests.py

  (reintegrate_with_self_referential_mergeinfo): Remove comment re XFail.

  (test_list): Remove XFail from reintegrate_with_self_referential_mergeinfo.

------------------------------------------
Started by an SCM change
Building remotely on minerva.apache.org (Ubuntu)
Updating https://svn.apache.org/repos/asf/subversion/trunk
U         subversion/libsvn_client/merge.c
U         subversion/tests/cmdline/merge_tests.py
At revision 917836
[subversion-trunk-ubuntu] $ /bin/bash -xe /tmp/hudson8973501884528008800.sh
+ cd subversion-trunk
+ make distclean
make: *** No rule to make target `distclean'.  Stop.
Recording test results


Mime
View raw message