Show More
@@ -8,7 +8,7 b' initialize darcs repo' | |||
|
8 | 8 | |
|
9 | 9 | $ mkdir darcs-repo |
|
10 | 10 | $ cd darcs-repo |
|
11 | $ darcs init | |
|
11 | $ darcs init -q | |
|
12 | 12 | $ echo a > a |
|
13 | 13 | $ darcs record -a -l -m p0 |
|
14 | 14 | Finished recording patch 'p0' |
@@ -43,6 +43,7 b' update source' | |||
|
43 | 43 | Backing up ./a(*) (glob) |
|
44 | 44 | We have conflicts in the following files: |
|
45 | 45 | ./a |
|
46 | (?) | |
|
46 | 47 | $ sleep 1 |
|
47 | 48 | $ echo e > a |
|
48 | 49 | $ echo f > f |
@@ -54,13 +55,13 b' update source' | |||
|
54 | 55 | |
|
55 | 56 | test file and directory move |
|
56 | 57 | |
|
57 | $ darcs mv f ff | |
|
58 | $ darcs mv -q f ff | |
|
58 | 59 | |
|
59 | 60 | Test remove + move |
|
60 | 61 | |
|
61 | $ darcs remove dir/d2 | |
|
62 | $ darcs remove -q dir/d2 | |
|
62 | 63 | $ rm dir/d2 |
|
63 | $ darcs mv dir dir2 | |
|
64 | $ darcs mv -q dir dir2 | |
|
64 | 65 | $ darcs record -a -l -m p3 |
|
65 | 66 | Finished recording patch 'p3' |
|
66 | 67 |
General Comments 0
You need to be logged in to leave comments.
Login now