subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From v...@apache.org
Subject svn commit: r1425419 - in /subversion/branches/javahl-ra: ./ subversion/libsvn_wc/adm_ops.c subversion/libsvn_wc/conflicts.c tools/dev/unix-build/Makefile.svn
Date Sun, 23 Dec 2012 06:23:59 GMT
Author: vmpn
Date: Sun Dec 23 06:23:59 2012
New Revision: 1425419

URL: http://svn.apache.org/viewvc?rev=1425419&view=rev
Log:
On the javahl-ra branch:

Bring up-to-date with trunk@1367112

Modified:
    subversion/branches/javahl-ra/   (props changed)
    subversion/branches/javahl-ra/subversion/libsvn_wc/adm_ops.c
    subversion/branches/javahl-ra/subversion/libsvn_wc/conflicts.c
    subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn

Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1366335-1367112

Modified: subversion/branches/javahl-ra/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_wc/adm_ops.c?rev=1425419&r1=1425418&r2=1425419&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_wc/adm_ops.c Sun Dec 23 06:23:59 2012
@@ -641,8 +641,8 @@ create_delete_wq_items(svn_skel_t **work
               SVN_ERR(svn_wc__wq_build_file_remove(&work_item, db,
                                                    local_abspath,
                                                    marker_abspath,
-                                                   scratch_pool,
-                                                   result_pool));
+                                                   result_pool,
+                                                   scratch_pool));
 
               *work_items = svn_wc__wq_merge(*work_items, work_item,
                                              result_pool);

Modified: subversion/branches/javahl-ra/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_wc/conflicts.c?rev=1425419&r1=1425418&r2=1425419&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_wc/conflicts.c Sun Dec 23 06:23:59 2012
@@ -2290,7 +2290,14 @@ resolve_conflict_on_node(svn_boolean_t *
       /* We currently handle *_conflict as *_full as this argument is currently
          always applied for all conflicts on a node at the same time. Giving
          an error would break some tests that assumed that this would just
-         resolve property conflicts to working */
+         resolve property conflicts to working.
+
+         An alternative way to handle these conflicts would be to just copy all
+         property state from mine/theirs on the _full option instead of just the
+         conflicted properties. In some ways this feels like a sensible option as
+         that would take both properties and text from mine/theirs, but when not
+         both properties and text are conflicted we would fail in doing so.
+       */
       switch (conflict_choice)
         {
         case svn_wc_conflict_choose_base:

Modified: subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn?rev=1425419&r1=1425418&r2=1425419&view=diff
==============================================================================
--- subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/branches/javahl-ra/tools/dev/unix-build/Makefile.svn Sun Dec 23 06:23:59 2012
@@ -631,6 +631,8 @@ $(NEON_OBJDIR)/.retrieved: $(DISTDIR)/$(
 	# fix build with OpenSSL lacking SSLv2 support:
 	cd $(NEON_SRCDIR)/src && svn diff -c 1865 \
 		$(NEON_SVN_URL)/src/ne_openssl.c | patch -p0
+	cd $(NEON_SRCDIR)/src && svn diff -c 1872 \
+		$(NEON_SVN_URL)/src/ne_openssl.c | patch -p0
 	cd $(NEON_SRCDIR)/src && svn diff -c 1865 \
 		$(NEON_SVN_URL)/src/ne_ssl.h | patch -p0
 	cd $(NEON_SRCDIR)/src && svn diff -c 1865 \



Mime
View raw message