Gitlet / testing / samples / test37-reset1.in
test37-reset1.in
Raw
# Check reset command.
I setup2.inc
> branch other
<<<
+ h.txt wug2.txt
> add h.txt
<<<
> rm g.txt
<<<
> commit "Add h.txt and remove g.txt"
<<<
> checkout other
<<<
> rm f.txt
<<<
+ k.txt wug3.txt
> add k.txt
<<<
> commit "Add k.txt and remove f.txt"
<<<
> log
===
${COMMIT_HEAD}
Add k.txt and remove f.txt

===
${COMMIT_HEAD}
Two files

===
${COMMIT_HEAD}
initial commit

<<<*
D INIT "${3}"
D TWO "${2}"
D OTHER1 "${1}"

> checkout master
<<<
> log
===
${COMMIT_HEAD}
Add h.txt and remove g.txt

===
${COMMIT_HEAD}
Two files

===
${COMMIT_HEAD}
initial commit
<<<*
D MASTER1 "${1}"
+ m.txt wug.txt
> add m.txt
<<<
> reset ${TWO}
<<<
> status
=== Branches ===
\*master
other

=== Staged Files ===

=== Removed Files ===

=== Modifications Not Staged For Commit ===

=== Untracked Files ===
(m\.txt\n)?\s*
<<<*

> log
===
${COMMIT_HEAD}
Two files

===
${COMMIT_HEAD}
initial commit
<<<*
> checkout other
<<<
> log
===
${COMMIT_HEAD}
Add k.txt and remove f.txt

===
${COMMIT_HEAD}
Two files

===
${COMMIT_HEAD}
initial commit

<<<*
> checkout master
<<<
> log
===
${COMMIT_HEAD}
Two files

===
${COMMIT_HEAD}
initial commit
<<<*
> reset ${MASTER1}
<<<
> log
===
${COMMIT_HEAD}
Add h.txt and remove g.txt

===
${COMMIT_HEAD}
Two files

===
${COMMIT_HEAD}
initial commit

<<<*