diff options
| author | Malf Furious <m@lfurio.us> | 2017-09-06 00:41:21 -0400 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2017-09-06 00:41:21 -0400 |
| commit | f92c0a75ba734090409716ebc8228453791d8909 (patch) | |
| tree | e95c921cd489aec619309d01ecca57cd3d780662 | |
| parent | 7dd31f64a4f57a2db2a504b026dbab7cde2b84bc (diff) | |
| download | systrunk-f92c0a75ba734090409716ebc8228453791d8909.tar.gz systrunk-f92c0a75ba734090409716ebc8228453791d8909.zip | |
Update action ops
Now clearing the MERG ptr if checking out or committing
| -rw-r--r-- | checkout.sh | 1 | ||||
| -rw-r--r-- | commit.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/checkout.sh b/checkout.sh index e340706..bcd9b99 100644 --- a/checkout.sh +++ b/checkout.sh @@ -72,5 +72,6 @@ function systr_checkout echo "Checking out files..." systr_rsync_normal "$path/revs/$commit/" . + echo "NULL" >.systr/MERG date >.systr/updated } @@ -90,6 +90,7 @@ function systr_commit systr_repo_finish_commit "$commit" "$branchcommit" echo "$commit" >.systr/BASE + echo "NULL" >.systr/MERG date >.systr/updated if [[ "$branch" != "$branchcommit" ]]; then |