Author: vmpn
Date: Sun Dec 23 06:48:04 2012
New Revision: 1425424
URL: http://svn.apache.org/viewvc?rev=1425424&view=rev
Log:
On the javahl-ra branch:
Bring up-to-date with JavaHL changes on trunk@1379426
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
subversion/branches/javahl-ra/subversion/include/svn_wc.h
subversion/branches/javahl-ra/subversion/libsvn_wc/conflicts.c
subversion/branches/javahl-ra/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/javahl-ra/subversion/libsvn_wc/update_editor.c
subversion/branches/javahl-ra/subversion/svn/tree-conflicts.c
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1379426
Modified:
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java?rev=1425424&r1=1425423&r2=1425424&view=diff
==============================================================================
---
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
(original)
+++
subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
Sun Dec 23 06:48:04 2012
@@ -250,7 +250,19 @@ public class ConflictDescriptor
/**
* Object is already replaced.
*/
- replaced;
+ replaced,
+
+ /**
+ * Object is moved away.
+ * @since 1.8
+ */
+ moved_away,
+
+ /**
+ * Object is moved here.
+ * @since 1.8
+ */
+ moved_here;
}
public enum Operation
Modified: subversion/branches/javahl-ra/subversion/include/svn_wc.h
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/include/svn_wc.h?rev=1425424&r1=1425423&r2=1425424&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/include/svn_wc.h (original)
+++ subversion/branches/javahl-ra/subversion/include/svn_wc.h Sun Dec 23
06:48:04 2012
@@ -1593,10 +1593,6 @@ typedef enum svn_wc_conflict_reason_t
svn_wc_conflict_reason_replaced,
/** Object is moved away. @since New in 1.8. */
svn_wc_conflict_reason_moved_away,
- /** Object is moved away and was edited post-move. @since New in 1.8. */
- /* ### Do we really need this. The edit state is on a different node,
- which might just change while the tree conflict exists? */
- svn_wc_conflict_reason_moved_away_and_edited,
/** Object is moved here. @since New in 1.8. */
svn_wc_conflict_reason_moved_here
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=1425424&r1=1425423&r2=1425424&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:48:04 2012
@@ -511,9 +511,6 @@ static const svn_token_map_t local_chang
{ "replaced", svn_wc_conflict_reason_replaced },
{ "moved-away", svn_wc_conflict_reason_moved_away },
{ "moved-here", svn_wc_conflict_reason_moved_here },
- /* ### Do we really need this. The edit state is on a different node,
- which might just change while the tree conflict exists? */
- { "moved-and-edited", svn_wc_conflict_reason_moved_away_and_edited },
{ NULL }
};
Modified: subversion/branches/javahl-ra/subversion/libsvn_wc/tree_conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_wc/tree_conflicts.c?rev=1425424&r1=1425423&r2=1425424&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_wc/tree_conflicts.c
(original)
+++ subversion/branches/javahl-ra/subversion/libsvn_wc/tree_conflicts.c Sun Dec
23 06:48:04 2012
@@ -78,7 +78,6 @@ const svn_token_map_t svn_wc__conflict_r
{ "replaced", svn_wc_conflict_reason_replaced },
{ "unversioned", svn_wc_conflict_reason_unversioned },
{ "moved-away", svn_wc_conflict_reason_moved_away },
- { "moved-away-and-edited", svn_wc_conflict_reason_moved_away_and_edited },
{ "moved-here", svn_wc_conflict_reason_moved_here },
{ NULL }
};
Modified: subversion/branches/javahl-ra/subversion/libsvn_wc/update_editor.c
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_wc/update_editor.c?rev=1425424&r1=1425423&r2=1425424&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_wc/update_editor.c
(original)
+++ subversion/branches/javahl-ra/subversion/libsvn_wc/update_editor.c Sun Dec
23 06:48:04 2012
@@ -1474,7 +1474,6 @@ check_tree_conflict(svn_skel_t **pconfli
if (reason == svn_wc_conflict_reason_edited
|| reason == svn_wc_conflict_reason_deleted
|| reason == svn_wc_conflict_reason_moved_away
- || reason == svn_wc_conflict_reason_moved_away_and_edited
|| reason == svn_wc_conflict_reason_replaced)
/* When the node existed before (it was locally deleted, replaced or
* edited), then 'update' cannot add it "again". So it can only send
@@ -1730,7 +1729,6 @@ delete_entry(const char *path,
}
else if (reason == svn_wc_conflict_reason_deleted
|| reason == svn_wc_conflict_reason_moved_away
- || reason == svn_wc_conflict_reason_moved_away_and_edited
|| reason == svn_wc_conflict_reason_replaced)
{
/* The item does not exist locally because it was already shadowed.
@@ -2264,7 +2262,6 @@ open_directory(const char *path,
db->pool, db->pool));
SVN_ERR_ASSERT(reason == svn_wc_conflict_reason_deleted
|| reason == svn_wc_conflict_reason_moved_away
- || reason == svn_wc_conflict_reason_moved_away_and_edited
|| reason == svn_wc_conflict_reason_replaced);
/* Continue updating BASE */
@@ -3309,7 +3306,6 @@ open_file(const char *path,
fb->pool, fb->pool));
SVN_ERR_ASSERT(reason == svn_wc_conflict_reason_deleted
|| reason == svn_wc_conflict_reason_moved_away
- || reason == svn_wc_conflict_reason_moved_away_and_edited
|| reason == svn_wc_conflict_reason_replaced);
/* Continue updating BASE */
Modified: subversion/branches/javahl-ra/subversion/svn/tree-conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/svn/tree-conflicts.c?rev=1425424&r1=1425423&r2=1425424&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/svn/tree-conflicts.c (original)
+++ subversion/branches/javahl-ra/subversion/svn/tree-conflicts.c Sun Dec 23
06:48:04 2012
@@ -63,7 +63,6 @@ static const svn_token_map_t map_conflic
{ N_("replace"), svn_wc_conflict_reason_replaced },
{ N_("unversioned"), svn_wc_conflict_reason_unversioned },
{ N_("moved away"), svn_wc_conflict_reason_moved_away },
- { N_("moved away and edited"), svn_wc_conflict_reason_moved_away_and_edited
},
{ N_("moved here"), svn_wc_conflict_reason_moved_here },
{ NULL, 0 }
};
@@ -79,7 +78,6 @@ static const svn_token_map_t map_conflic
{ "replace", svn_wc_conflict_reason_replaced },
{ "unversioned", svn_wc_conflict_reason_unversioned },
{ "moved-away", svn_wc_conflict_reason_moved_away },
- { "moved-away-and-edited", svn_wc_conflict_reason_moved_away_and_edited },
{ "moved-here", svn_wc_conflict_reason_moved_here },
{ NULL, 0 }
};
