From becff376751ea626567dba03fea75b6d153187d0 Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Mon, 3 Sep 2012 16:08:09 +0000 Subject: Rewrite edit command to expect SYSTEM STRATUM [CHUNK] parameters Editing no longer requires a repository to be specified, neither does it require a branch. It now starts off from a system morphology that is required to exist in the branch root repository. Relative to this system, "morph edit" realises the repository of a stratum and, optionally, a chunk, creates edit branches named after the system branch, if necessary, and update the references in the system and stratum morphology accordingly. The changes made to any of the repositories in the system branch are not committed. All existing changes are updated to work with this new input syntax for "morph edit". --- tests.branching/workflow.script | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests.branching/workflow.script') diff --git a/tests.branching/workflow.script b/tests.branching/workflow.script index c8ee2187..cb79c3c5 100755 --- a/tests.branching/workflow.script +++ b/tests.branching/workflow.script @@ -24,7 +24,7 @@ set -eu cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" init "$SRCDIR/scripts/test-morph" branch baserock:morphs me/readme-fix -"$SRCDIR/scripts/test-morph" edit baserock:hello master +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello cd me/readme-fix/baserock:hello echo > README yoyoyo git add README @@ -33,6 +33,6 @@ git commit -m "Fix README, yo!" --quiet cd "$DATADIR/workspace" "$SRCDIR/scripts/test-morph" checkout baserock:morphs master cd master -"$SRCDIR/scripts/test-morph" edit baserock:hello master +"$SRCDIR/scripts/test-morph" edit hello-system hello-stratum hello "$SRCDIR/scripts/test-morph" merge me/readme-fix baserock:hello -- cgit v1.2.1