ashang
diff --git a/‎UnitTests/HttpInterface/api-replication-rocksdb-spec.rb
Lines changed: 0 additions & 4 deletions b/‎UnitTests/HttpInterface/api-replication-rocksdb-spec.rb
Lines changed: 0 additions & 4 deletions
diff --git a/‎arangod/Replication/Syncer.cpp
Lines changed: 8 additions & 1 deletion b/‎arangod/Replication/Syncer.cpp
Lines changed: 8 additions & 1 deletion
diff --git a/‎arangod/RocksDBEngine/RocksDBReplicationTailing.cpp
Lines changed: 1 addition & 2 deletions b/‎arangod/RocksDBEngine/RocksDBReplicationTailing.cpp
Lines changed: 1 addition & 2 deletions
@@ -510,8 +510,6 @@
             document["type"].should eq(2302)
             document["cid"].should eq(cid)
             document["data"]["_key"].should eq("test")
-            document["data"]["_rev"].should match(/^[a-zA-Z0-9_\-]+$/)
-            document["data"]["_rev"].should_not eq(rev)
 
             i = i + 1
           elsif i == 3 and document["type"] == 2001 and document["cid"] == cid
@@ -1630,8 +1628,6 @@
             document["type"].should eq(2302)
             document["cid"].should eq(cid)
             document["data"]["_key"].should eq("test")
-            document["data"]["_rev"].should match(/^[a-zA-Z0-9_\-]+$/)
-            document["data"]["_rev"].should_not eq(rev)
 
             i = i + 1
           elsif i == 3 and document["type"] == 2001 and document["cid"] == cid
 
@@ -655,6 +655,13 @@ Result Syncer::createIndex(VPackSlice const& slice) {
     return Result(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND,
                   "did not find collection for index");
   }
+  
+  VPackBuilder s;
+  s.openObject();
+  s.add("objectId", VPackSlice::nullSlice());
+  s.close();
+  VPackBuilder merged = VPackCollection::merge(indexSlice, s.slice(),
+                                               /*mergeValues*/true, /*nullMeansRemove*/true);
 
   try {
     SingleCollectionTransaction trx(transaction::StandaloneContext::Create(vocbase),
@@ -669,7 +676,7 @@ Result Syncer::createIndex(VPackSlice const& slice) {
     auto physical = trx.documentCollection()->getPhysical();
     TRI_ASSERT(physical != nullptr);
     std::shared_ptr<arangodb::Index> idx;
-    res = physical->restoreIndex(&trx, indexSlice, idx);
+    res = physical->restoreIndex(&trx, merged.slice(), idx);
     res = trx.finish(res);
 
     return res;
 
@@ -419,7 +419,6 @@ class WALParser : public rocksdb::WriteBatch::Handler {
     TRI_ASSERT(_currentDbId != 0 && _currentCid != 0);
     TRI_ASSERT(!_removeDocumentKey.empty());
 
-    uint64_t revId = RocksDBKey::revisionId(RocksDBEntryType::Document, key);
     _builder.openObject();
     _builder.add("tick", VPackValue(std::to_string(_currentSequence)));
     _builder.add("type", VPackValue(static_cast<uint64_t>(REPLICATION_MARKER_REMOVE)));
@@ -432,8 +431,8 @@ class WALParser : public rocksdb::WriteBatch::Handler {
     }
     _builder.add("tid", VPackValue(std::to_string(_currentTrxId)));
     _builder.add("data", VPackValue(VPackValueType::Object));
+    // only pass on _key, but no _rev
     _builder.add(StaticStrings::KeyString, VPackValue(_removeDocumentKey));
-    _builder.add(StaticStrings::RevString, VPackValue(std::to_string(revId)));
     _builder.close();
     _builder.close();
     _removeDocumentKey.clear();