subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn propchange: r878399 - svn:log
Date Tue, 01 May 2012 14:38:49 GMT
Author: pburba
Revision: 878399
Modified property: svn:log

Modified: svn:log at Tue May  1 14:38:49 2012
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue May  1 14:38:49 2012
@@ -1,5 +1,5 @@
 Fix issue #3432 'Merge can record mergeinfo from natural history gaps',
-reimplementing r34393 along the way.
+reimplementing r874467 along the way.
 
 * subversion/libsvn_client/merge.c
   (merge_cmd_baton_t): New member implicit_src_gap.
@@ -12,7 +12,7 @@ reimplementing r34393 along the way.
   (populate_remaining_ranges): Use new find_gaps_in_merge_source_history
   function to find any gap in the merge source's natural history and stash
   this information in the new merge_cmd_baton_t member.  Rip out the old
-  r34393 fix for dealing with gaps in natural history.
+  r874467 fix for dealing with gaps in natural history.
   (do_file_merge): Update call to calculate_remaining_ranges().
   (record_mergeinfo_for_dir_merge): Remove natural history gaps from the
   mergeinfo recorded to describe this merge.


Mime
View raw message