Kbshl feature/add content assets support (#38)

* feat: add content assets support * build(package): add more descriptive test run script names * chore(package): fix github links in package.json * updated travis Co-authored-by: Konstantin Büschel <[email protected]>
callawaycloud · Jul 7, 2020 · 07ed679 · 07ed679
2 parents ed6ed3e + 47661ac
commit 07ed679
Show file tree

Hide file tree

Showing 175 changed files with 177 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,4 +5,4 @@ install:
   - npm install
   - npm install --global sfdx-cli
 script:
-  - npm run integrationTest
+  - npm run test:integration
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
 # sfdx-git-packager
 
-![npm](https://img.shields.io/npm/v/sfdx-git-packager) [![Build Status](https://travis-ci.org/ChuckJonas/sfdx-git-packager.svg?branch=master)](https://travis-ci.org/ChuckJonas/sfdx-git-packager)
+![npm](https://img.shields.io/npm/v/sfdx-git-packager) [![Build Status](https://travis-ci.org/callawaycloud/sfdx-git-packager.svg?branch=master)](https://travis-ci.org/ChuckJonas/sfdx-git-packager)
 
 Generates a metadata package (`package.xml` & source files) for differences between two git refs (branches or commits).
 
-The goal of this project is to be able to generate incremental, deployable packages to use in a CI or developer workflows (see our [Callaway Cloud CI](https://github.com/ChuckJonas/generator-ccc/blob/master/generators/app/templates/static/build/pipelines-setup.md) for an example).  Unfortunately, there are still some scenario's which are not supported.  We attempt to document these problems and workarounds in [this document](https://github.com/ChuckJonas/sfdx-git-packager/blob/master/common-issues.md).
+The goal of this project is to be able to generate incremental, deployable packages to use in a CI or developer workflows (see our [Callaway Cloud CI](https://github.com/ChuckJonas/generator-ccc/blob/master/generators/app/templates/static/build/pipelines-setup.md) for an example). Unfortunately, there are still some scenario's which are not supported. We attempt to document these problems and workarounds in [this document](https://github.com/ChuckJonas/sfdx-git-packager/blob/master/common-issues.md).
 
 ## 📦 Install
 
@@ -36,15 +36,16 @@ Run `sfdx plugins:install sfdx-git-packager`
 Must be run from inside an sfdx project with an initialized git repo.
 
 <!-- commands -->
-* [`sfdx git:package -d <string> [-s <string>] [-t <string>] [-w] [--purge] [--nodelete] [-f] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-gitpackage--d-string--s-string--t-string--w---purge---nodelete--f---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
+
+- [`sfdx git:package -d <string> [-s <string>] [-t <string>] [-w] [--purge] [--nodelete] [-f] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`](#sfdx-gitpackage--d-string--s-string--t-string--w---purge---nodelete--f---json---loglevel-tracedebuginfowarnerrorfataltracedebuginfowarnerrorfatal)
 
 ## `sfdx git:package -d <string> [-s <string>] [-t <string>] [-w] [--purge] [--nodelete] [-f] [--json] [--loglevel trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]`
 
 Generates a Metadata Package using the differences between two git refs (branch or commit)
 
 ```
 USAGE
-  $ sfdx git:package -d <string> [-s <string>] [-t <string>] [-w] [--purge] [--nodelete] [-f] [--json] [--loglevel 
+  $ sfdx git:package -d <string> [-s <string>] [-t <string>] [-w] [--purge] [--nodelete] [-f] [--json] [--loglevel
   trace|debug|info|warn|error|fatal|TRACE|DEBUG|INFO|WARN|ERROR|FATAL]
 
 OPTIONS
@@ -83,7 +84,8 @@ EXAMPLES
   $ sfdx git:package -s feature-b -d deploy/feature-b
 ```
 
-_See code: [lib/commands/git/package.js](https://github.com/ChuckJonas/sfdx-git-diff-to-pkg/blob/v0.2.1/lib/commands/git/package.js)_
+_See code: [lib/commands/git/package.js](https://github.com/ChuckJonas/sfdx-git-diff-to-pkg/blob/v0.2.2/lib/commands/git/package.js)_
+
 <!-- commandsstop -->
 
 ### Ignore Files
@@ -123,15 +125,14 @@ We've got a git repo in `test/integration/project` that represents a project. In
 
 **Updating the base state (master)**
 
-You might find the base state (master branch) is not setup properly in order to perform some test (you add a support for metadata not part of master).  If you need to modify the base state, follow these instructions:
+You might find the base state (master branch) is not setup properly in order to perform some test (you add a support for metadata not part of master). If you need to modify the base state, follow these instructions:
 
-1. Open the integration project.  Run `npm run tgu` if you haven't already.
+1. Open the integration project. Run `npm run tgu` if you haven't already.
 1. `git checkout master`
-1. make your changes.  Try to avoid making changes that will cause merge conflicts on any of the other branches
+1. make your changes. Try to avoid making changes that will cause merge conflicts on any of the other branches
 1. commit your changes to master
 1. Sync master to all other branches by running `./syncMaster.sh`
 
-
 ## Disclaimer
 
 THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "sfdx-git-packager",
   "description": "Generates a package.xml for difference between two branches",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "author": "Charlie Jonas @ChuckJonas",
-  "bugs": "https://github.com/ChuckJonas/sfdx-git-diff-to-pkg/issues",
+  "bugs": "https://github.com/callawaycloud/sfdx-git-packager/issues",
   "dependencies": {
     "@oclif/command": "^1",
     "@oclif/config": "^1",
@@ -47,7 +47,7 @@
     "/npm-shrinkwrap.json",
     "/oclif.manifest.json"
   ],
-  "homepage": "https://github.com/ChuckJonas/sfdx-git-diff-to-pkg",
+  "homepage": "https://github.com/callawaycloud/sfdx-git-packager",
   "keywords": [
     "sfdx-plugin"
   ],
@@ -64,12 +64,14 @@
       "@oclif/plugin-help"
     ]
   },
-  "repository": "ChuckJonas/sfdx-git-diff-to-pkg",
+  "repository": "https://github.com/callawaycloud/sfdx-git-packager.git",
   "scripts": {
     "postpack": "rm -f oclif.manifest.json",
     "posttest": "tslint -p test -t stylish",
     "prepack": "rm -rf lib && tsc -b && oclif-dev manifest && oclif-dev readme",
     "test": "nyc --extension .ts mocha --timeout 99999 --forbid-only \"test/{*.test.ts,!(integration)/**/*.test.ts}\"",
+    "test:integration": "npm run integrationTest",
+    "test:generate:output": "npm run gen",
     "integrationTest": "nyc --extension .ts mocha --timeout 99999 --forbid-only \"test/integration/**/*.test.ts\"",
     "version": "oclif-dev readme && git add README.md",
     "tgp": "mv test/integration/project/.git test/integration/project/.notgit",

diff --git a/src/metadataResolvers.ts b/src/metadataResolvers.ts
@@ -22,7 +22,14 @@ interface MetadataResolver {
 const metadataResolvers: MetadataResolver[] = [
   { // MD that has paired -meta.xml file.  Probably missing some types
     match: path => {
-      return ['.cls', '.trigger', '.page', '.component', '.email'].includes(extname(path));
+      return [
+        '.asset',
+        '.cls',
+        '.component',
+        '.email',
+        '.page',
+        '.trigger'
+      ].includes(extname(path));
     },
     getMetadataPaths: async (path: string) => {
       return [path, path + '-meta.xml'];

diff --git a/test/integration/integration.test.ts b/test/integration/integration.test.ts
@@ -95,4 +95,17 @@ describe('git:package integration test', async () => {
     });
   });
 
+  describe('content assets', async() => {
+    it('detects new content assets', async () => {
+      await runTest('add_content_asset');
+    });
+
+    it('detects an update to content assets', async () => {
+      await runTest('mod_content_asset');
+    });
+
+    it('detects full deletion of content assets', async () => {
+      await runTest('del_content_asset');
+    });
+  });
 });
diff --git a/test/integration/output/add_content_asset/contentassets/example2.asset b/test/integration/output/add_content_asset/contentassets/example2.asset
@@ -0,0 +1 @@
+My example 2 assets content
diff --git a/test/integration/output/add_content_asset/contentassets/example2.asset-meta.xml b/test/integration/output/add_content_asset/contentassets/example2.asset-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentAsset xmlns="http://soap.sforce.com/2006/04/metadata">
+    <isVisibleByExternalUsers>false</isVisibleByExternalUsers>
+    <language>en_US</language>
+    <masterLabel>example2</masterLabel>
+    <relationships>
+        <organization>
+            <access>VIEWER</access>
+        </organization>
+    </relationships>
+    <versions>
+        <version>
+            <number>1</number>
+            <pathOnClient>example2.txt</pathOnClient>
+        </version>
+    </versions>
+</ContentAsset>
diff --git a/test/integration/output/add_content_asset/package.xml b/test/integration/output/add_content_asset/package.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+  <types>
+    <name>ContentAsset</name>
+    <members>example2</members>
+  </types>
+  <version>45.0</version>
+</Package>
diff --git a/test/integration/output/del_content_asset/destructiveChangesPost.xml b/test/integration/output/del_content_asset/destructiveChangesPost.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+  <types>
+    <name>ContentAsset</name>
+    <members>example</members>
+  </types>
+  <version>45.0</version>
+</Package>
diff --git a/test/integration/output/del_content_asset/package.xml b/test/integration/output/del_content_asset/package.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><Package xmlns="http://soap.sforce.com/2006/04/metadata"><version>45.0</version></Package>
diff --git a/test/integration/output/mod_content_asset/contentassets/example.asset b/test/integration/output/mod_content_asset/contentassets/example.asset
@@ -0,0 +1 @@
+My example assets content with modifications now.
diff --git a/test/integration/output/mod_content_asset/contentassets/example.asset-meta.xml b/test/integration/output/mod_content_asset/contentassets/example.asset-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentAsset xmlns="http://soap.sforce.com/2006/04/metadata">
+    <isVisibleByExternalUsers>false</isVisibleByExternalUsers>
+    <language>en_US</language>
+    <masterLabel>example</masterLabel>
+    <relationships>
+        <organization>
+            <access>VIEWER</access>
+        </organization>
+    </relationships>
+    <versions>
+        <version>
+            <number>2</number>
+            <pathOnClient>example.txt</pathOnClient>
+        </version>
+    </versions>
+</ContentAsset>
diff --git a/test/integration/output/mod_content_asset/package.xml b/test/integration/output/mod_content_asset/package.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://soap.sforce.com/2006/04/metadata">
+  <types>
+    <name>ContentAsset</name>
+    <members>example</members>
+  </types>
+  <version>45.0</version>
+</Package>
diff --git a/...tegration/output/mod_partially_delete_static_resource/staticresources/TestFolder.resource b/...tegration/output/mod_partially_delete_static_resource/staticresources/TestFolder.resource
diff --git a/test/integration/project/.notgit/COMMIT_EDITMSG b/test/integration/project/.notgit/COMMIT_EDITMSG
@@ -1 +1 @@
-Modified Foo label
+fix: delete content asset
diff --git a/test/integration/project/.notgit/ORIG_HEAD b/test/integration/project/.notgit/ORIG_HEAD
@@ -1 +1 @@
-d16ab36858b057d193883338326bbb6fb800efbb
+e96fd19fce8cf550d402834e38e7f992c4ee5c97
diff --git a/test/integration/project/.notgit/index b/test/integration/project/.notgit/index
diff --git a/test/integration/project/.notgit/logs/refs/heads/add_class b/test/integration/project/.notgit/logs/refs/heads/add_class
@@ -2,3 +2,4 @@
 8d411d5e0074d561e39cc35aec38f7e755e69604 5a3cbf0fab4e6fe1fd0a512830f9bf2b8cea23cb Charlie Jonas <[email protected]> 1572499649 -0600	commit: Added a new class
 5a3cbf0fab4e6fe1fd0a512830f9bf2b8cea23cb 6a7f0bd2f4ec07bcf912e11318b3de4b99cc0a2b Charlie Jonas <[email protected]> 1585693998 -0600	merge master: Merge made by the 'recursive' strategy.
 6a7f0bd2f4ec07bcf912e11318b3de4b99cc0a2b cc525eb980043cd9d0448a38e0786fb0613460d5 Charlie Jonas <[email protected]> 1585694316 -0600	merge master: Merge made by the 'recursive' strategy.
+cc525eb980043cd9d0448a38e0786fb0613460d5 7c17c4fbd49de86bafdf192cd54d4ffaf3ef9538 Konstantin Büschel <[email protected]> 1594039383 +0200	merge master: Merge made by the 'recursive' strategy.
diff --git a/test/integration/project/.notgit/logs/refs/heads/add_content_asset b/test/integration/project/.notgit/logs/refs/heads/add_content_asset
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 e96fd19fce8cf550d402834e38e7f992c4ee5c97 Konstantin Büschel <[email protected]> 1594039397 +0200	branch: Created from HEAD
+e96fd19fce8cf550d402834e38e7f992c4ee5c97 c5efde05d862c88ff2e563ba1c71a99fb04215c0 Konstantin Büschel <[email protected]> 1594039467 +0200	commit: feat: add new content asset
diff --git a/test/integration/project/.notgit/logs/refs/heads/add_field b/test/integration/project/.notgit/logs/refs/heads/add_field
@@ -2,3 +2,4 @@
 8d411d5e0074d561e39cc35aec38f7e755e69604 c1c94fde73cdfff1a47e0fe7162bdc06137b2559 Charlie Jonas <[email protected]> 1572499757 -0600	commit: added a field
 c1c94fde73cdfff1a47e0fe7162bdc06137b2559 a69a052fae73905760cfccb3d52843f372441c82 Charlie Jonas <[email protected]> 1585694143 -0600	merge master: Merge made by the 'recursive' strategy.
 a69a052fae73905760cfccb3d52843f372441c82 064c287513f2cee14de90de7f7d1c458f82c3bd1 Charlie Jonas <[email protected]> 1585694316 -0600	merge master: Merge made by the 'recursive' strategy.
+064c287513f2cee14de90de7f7d1c458f82c3bd1 0e7abe503db8e34699e97c4f847f84980603ac6d Konstantin Büschel <[email protected]> 1594039383 +0200	merge master: Merge made by the 'recursive' strategy.
diff --git a/test/integration/project/.notgit/logs/refs/heads/add_label b/test/integration/project/.notgit/logs/refs/heads/add_label
@@ -1,2 +1,3 @@
 0000000000000000000000000000000000000000 d16ab36858b057d193883338326bbb6fb800efbb Charlie Jonas <[email protected]> 1585694544 -0600	branch: Created from HEAD
 d16ab36858b057d193883338326bbb6fb800efbb 5f48b02b8c1399a4f8397b7574a2740f27a532ed Charlie Jonas <[email protected]> 1585694596 -0600	commit: adding custom label buzz
+5f48b02b8c1399a4f8397b7574a2740f27a532ed c0ee7720ea240ff7e507bb9d508e6a2582806132 Konstantin Büschel <[email protected]> 1594039383 +0200	merge master: Merge made by the 'recursive' strategy.
diff --git a/test/integration/project/.notgit/logs/refs/heads/add_object b/test/integration/project/.notgit/logs/refs/heads/add_object
@@ -2,3 +2,4 @@
 8d411d5e0074d561e39cc35aec38f7e755e69604 a0a46a9f8fd191238537bd26d28b7a035f90b77f Charlie Jonas <[email protected]> 1572499833 -0600	commit: added an object
 a0a46a9f8fd191238537bd26d28b7a035f90b77f 56f3680debc42380c4442f90056d843d368c4068 Charlie Jonas <[email protected]> 1585694075 -0600	merge master: Merge made by the 'recursive' strategy.
 56f3680debc42380c4442f90056d843d368c4068 86b1450226a2bbeb49aa0f8c4796e2e6a5435cec Charlie Jonas <[email protected]> 1585694316 -0600	merge master: Merge made by the 'recursive' strategy.
+86b1450226a2bbeb49aa0f8c4796e2e6a5435cec 1627005cd6b49621c12271e5e5a990c4bf0c898f Konstantin Büschel <[email protected]> 1594039383 +0200	merge master: Merge made by the 'recursive' strategy.
diff --git a/test/integration/project/.notgit/logs/refs/heads/add_static_resource b/test/integration/project/.notgit/logs/refs/heads/add_static_resource
@@ -2,3 +2,4 @@
 8d411d5e0074d561e39cc35aec38f7e755e69604 35a9ec2d9c608f949a4b7acb27f48102d55cc4c4 Charlie Jonas <[email protected]> 1572499907 -0600	commit: added a static resource
 35a9ec2d9c608f949a4b7acb27f48102d55cc4c4 3e1174f3fea73f08f3d3908f3e6b1a3673d4bfc5 Charlie Jonas <[email protected]> 1585694083 -0600	merge master: Merge made by the 'recursive' strategy.
 3e1174f3fea73f08f3d3908f3e6b1a3673d4bfc5 b83bc885093e999543476a275b36ae906e87dfb4 Charlie Jonas <[email protected]> 1585694316 -0600	merge master: Merge made by the 'recursive' strategy.
+b83bc885093e999543476a275b36ae906e87dfb4 a1bdaa10cd694ef193e382e22fe67a9c7aee1502 Konstantin Büschel <[email protected]> 1594039383 +0200	merge master: Merge made by the 'recursive' strategy.
diff --git a/test/integration/project/.notgit/logs/refs/heads/del_class b/test/integration/project/.notgit/logs/refs/heads/del_class
@@ -2,3 +2,4 @@
 8d411d5e0074d561e39cc35aec38f7e755e69604 3e9ae7f54c4954c400dbf2b3b59c8d6b6b95b552 Charlie Jonas <[email protected]> 1572499484 -0600	commit: deleted a class
 3e9ae7f54c4954c400dbf2b3b59c8d6b6b95b552 8dad056fc3e4203b92cd0b2ae1553d13b8e7c6e3 Charlie Jonas <[email protected]> 1585694095 -0600	merge master: Merge made by the 'recursive' strategy.
 8dad056fc3e4203b92cd0b2ae1553d13b8e7c6e3 6bee5e08ccca407a2cd1daed5d97d14e9daa0c73 Charlie Jonas <[email protected]> 1585694316 -0600	merge master: Merge made by the 'recursive' strategy.
+6bee5e08ccca407a2cd1daed5d97d14e9daa0c73 18fc22bb034de6224b625873a7580ad9da16032a Konstantin Büschel <[email protected]> 1594039383 +0200	merge master: Merge made by the 'recursive' strategy.
diff --git a/test/integration/project/.notgit/logs/refs/heads/del_content_asset b/test/integration/project/.notgit/logs/refs/heads/del_content_asset
@@ -0,0 +1,5 @@
+0000000000000000000000000000000000000000 e96fd19fce8cf550d402834e38e7f992c4ee5c97 Konstantin Büschel <[email protected]> 1594039485 +0200	branch: Created from HEAD
+e96fd19fce8cf550d402834e38e7f992c4ee5c97 c5efde05d862c88ff2e563ba1c71a99fb04215c0 Konstantin Büschel <[email protected]> 1594039515 +0200	branch: Reset to HEAD
+c5efde05d862c88ff2e563ba1c71a99fb04215c0 7d6c7e7d7627ec140c2ec81c5a06fd7a77b6ced0 Konstantin Büschel <[email protected]> 1594039552 +0200	commit: fix: delete first example content asset
+7d6c7e7d7627ec140c2ec81c5a06fd7a77b6ced0 e96fd19fce8cf550d402834e38e7f992c4ee5c97 Konstantin Büschel <[email protected]> 1594039961 +0200	branch: Reset to HEAD
+e96fd19fce8cf550d402834e38e7f992c4ee5c97 050153e345e4c07bd3fa3b6a441e58330e212330 Konstantin Büschel <[email protected]> 1594040009 +0200	commit: fix: delete content asset
diff --git a/test/integration/project/.notgit/logs/refs/heads/del_field b/test/integration/project/.notgit/logs/refs/heads/del_field
@@ -2,3 +2,4 @@
 8d411d5e0074d561e39cc35aec38f7e755e69604 6ca28dc0d4a530a2805465e4220c6973702acfe0 Charlie Jonas <[email protected]> 1572499516 -0600	commit: deleted a field
 6ca28dc0d4a530a2805465e4220c6973702acfe0 fef5c63bb0b4312b52c7c5809e1f494d5c13fe74 Charlie Jonas <[email protected]> 1585694099 -0600	merge master: Merge made by the 'recursive' strategy.
 fef5c63bb0b4312b52c7c5809e1f494d5c13fe74 84e0dcedd61c060465647c9b8a63f725e806e065 Charlie Jonas <[email protected]> 1585694316 -0600	merge master: Merge made by the 'recursive' strategy.
+84e0dcedd61c060465647c9b8a63f725e806e065 b1ff552753b177f4a73163d9ac54bc0a751a177b Konstantin Büschel <[email protected]> 1594039383 +0200	merge master: Merge made by the 'recursive' strategy.
diff --git a/test/integration/project/.notgit/logs/refs/heads/del_object b/test/integration/project/.notgit/logs/refs/heads/del_object
@@ -2,3 +2,4 @@
 8d411d5e0074d561e39cc35aec38f7e755e69604 c035a6c3e73bb3935521a631024a4cf5d0c5a050 Charlie Jonas <[email protected]> 1572499552 -0600	commit: deleted an object
 c035a6c3e73bb3935521a631024a4cf5d0c5a050 7934f128ffb6b9d2a9286b437df5f24c08e1eb93 Charlie Jonas <[email protected]> 1585694102 -0600	merge master: Merge made by the 'recursive' strategy.
 7934f128ffb6b9d2a9286b437df5f24c08e1eb93 ea9067c6f5b2cb7d6fec6409b19acde5ede15022 Charlie Jonas <[email protected]> 1585694316 -0600	merge master: Merge made by the 'recursive' strategy.
+ea9067c6f5b2cb7d6fec6409b19acde5ede15022 98a00119f19124b89e1d93d3ecaa6ebbf6b88111 Konstantin Büschel <[email protected]> 1594039384 +0200	merge master: Merge made by the 'recursive' strategy.
diff --git a/test/integration/project/.notgit/logs/refs/heads/del_single_file_from_folder b/test/integration/project/.notgit/logs/refs/heads/del_single_file_from_folder
@@ -2,3 +2,4 @@
 8d411d5e0074d561e39cc35aec38f7e755e69604 30d3d6de84f92e87588340070a04fa5b37050a63 Charlie Jonas <[email protected]> 1572500870 -0600	commit: removed LWC file
 30d3d6de84f92e87588340070a04fa5b37050a63 87bc3a56a5eef23dc6e638629a1ccfdd187c9ca9 Charlie Jonas <[email protected]> 1585694105 -0600	merge master: Merge made by the 'recursive' strategy.
 87bc3a56a5eef23dc6e638629a1ccfdd187c9ca9 b89cdd7fc5c7a10265db24090b34af8bbe0cca47 Charlie Jonas <[email protected]> 1585694316 -0600	merge master: Merge made by the 'recursive' strategy.
+b89cdd7fc5c7a10265db24090b34af8bbe0cca47 32457dec5aa26909e1495a6e141850966ababf86 Konstantin Büschel <[email protected]> 1594039384 +0200	merge master: Merge made by the 'recursive' strategy.
diff --git a/test/integration/project/.notgit/logs/refs/heads/del_static_resource b/test/integration/project/.notgit/logs/refs/heads/del_static_resource
@@ -2,3 +2,4 @@
 8d411d5e0074d561e39cc35aec38f7e755e69604 f338dc01b565c816e8faa8d5e8dbe7be9334f390 Charlie Jonas <[email protected]> 1572499603 -0600	commit: deleted a static resource (single file)
 f338dc01b565c816e8faa8d5e8dbe7be9334f390 53c50e2833d5f66484d2432e95bc12e0f7cafe29 Charlie Jonas <[email protected]> 1585694107 -0600	merge master: Merge made by the 'recursive' strategy.
 53c50e2833d5f66484d2432e95bc12e0f7cafe29 ad961617c40c3c80675c7ee134a8202e388c3988 Charlie Jonas <[email protected]> 1585694316 -0600	merge master: Merge made by the 'recursive' strategy.
+ad961617c40c3c80675c7ee134a8202e388c3988 7493519fd3134d9e8d7462fb3d14c787f6cf42bd Konstantin Büschel <[email protected]> 1594039384 +0200	merge master: Merge made by the 'recursive' strategy.
diff --git a/test/integration/project/.notgit/logs/refs/heads/master b/test/integration/project/.notgit/logs/refs/heads/master
@@ -1,3 +1,4 @@
 0000000000000000000000000000000000000000 8d411d5e0074d561e39cc35aec38f7e755e69604 Charlie Jonas <[email protected]> 1572499104 -0600	commit (initial): created a base project with some metadata that can be used to test modification & deletions
 8d411d5e0074d561e39cc35aec38f7e755e69604 1a45bb711c9b5310e82e049ced5322b1eb227969 Charlie Jonas <[email protected]> 1585693496 -0600	commit: Added Labels
 1a45bb711c9b5310e82e049ced5322b1eb227969 d16ab36858b057d193883338326bbb6fb800efbb Charlie Jonas <[email protected]> 1585694187 -0600	commit: added sync master script
+d16ab36858b057d193883338326bbb6fb800efbb e96fd19fce8cf550d402834e38e7f992c4ee5c97 Konstantin Büschel <[email protected]> 1594039368 +0200	commit: feat: add content asset
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<?xml version="1.0" encoding="UTF-8"?><Package xmlns="http://soap.sforce.com/2006/04/metadata"><version>45.0</version></Package>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		My example assets content with modifications now.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		d16ab36858b057d193883338326bbb6fb800efbb
		e96fd19fce8cf550d402834e38e7f992c4ee5c97
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		0000000000000000000000000000000000000000 e96fd19fce8cf550d402834e38e7f992c4ee5c97 Konstantin Büschel <[email protected]> 1594039397 +0200 branch: Created from HEAD
		e96fd19fce8cf550d402834e38e7f992c4ee5c97 c5efde05d862c88ff2e563ba1c71a99fb04215c0 Konstantin Büschel <[email protected]> 1594039467 +0200 commit: feat: add new content asset