Download:
child 44:a6137e70b11c
parent 42:34ee83bd5ad2
43:0b7988041786
Anton Shestakov <engored@ya.ru>, Wed, 03 Sep 2014 22:21:33 +0900
New shell sessions for checking vcs prompts.

3 файлов изменено, 24 вставок(+), 36 удалений(-) [+]
docs/prompt-session-git.sh file | annotate | diff | comparison | revisions
docs/prompt-session-hg.sh file | annotate | diff | comparison | revisions
docs/prompt_screens.sh file | annotate | diff | comparison | revisions
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/prompt-session-git.sh Wed Sep 03 22:21:33 2014 +0900
@@ -0,0 +1,13 @@
+#!/bin/false
+# paste this into an interactive shell
+
+cd /tmp/ && git init gitrepo && cd gitrepo/
+echo 'a' > foo
+git add foo
+git commit -m 'a'
+echo 'b' >> foo
+git commit -a -m 'b'
+git checkout HEAD@{1}
+git checkout -b secret
+echo 's' >> foo && git commit -a -m 's'
+git merge master --strategy=ours --no-commit
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/docs/prompt-session-hg.sh Wed Sep 03 22:21:33 2014 +0900
@@ -0,0 +1,11 @@
+#!/bin/false
+# paste this into an interactive shell
+
+cd /tmp/ && hg init hgrepo && cd hgrepo/
+echo 'a' > foo && hg add foo
+hg ci -m 'a'
+echo 'b' >> foo && hg ci -m 'b'
+hg up 0 -q
+hg branch secret -q
+echo 's' >> foo && hg ci --secret -m 's'
+hg merge default -q --tool=internal:local
--- a/docs/prompt_screens.sh Fri Aug 29 02:51:26 2014 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-set -x
-
-
-### MERCURIAL: PREPARE COMMIT GRAPH
-
-hg init /tmp/hgrepo && cd /tmp/hgrepo
-
-# revision 0
-echo "Haikus are easy" > poem && hg ci --addremove -m "First steps"
-
-# revision 1
-echo "Refrigerator" >> poem && hg ci -m "Progress!"
-
-# revision 2, another head
-hg up -r 0 && echo "But sometimes they don't make sense" >> poem && hg ci -m "How could I forget?"
-
-
-### MERCURIAL: DEMONSTRATE
-
-# clean repo at 2: minimal info
-hg up -r 2 -C && read
-
-# branch branch branch
-hg branch branch && read
-
-# dirty working directory
-echo "Roses are red" >> poem && read
-
-# clean, but not up-to-date repo at 1
-hg up -C -r 1 && read
-
-# merging
-hg merge && read
-