Show More
@@ -32,7 +32,7 b' initialize darcs repo' | |||||
32 |
|
32 | |||
33 | branch and update |
|
33 | branch and update | |
34 |
|
34 | |||
35 | $ darcs get darcs-repo darcs-clone >/dev/null |
|
35 | $ darcs get -q darcs-repo darcs-clone >/dev/null | |
36 | $ cd darcs-clone |
|
36 | $ cd darcs-clone | |
37 | $ echo c >> a |
|
37 | $ echo c >> a | |
38 | $ echo c > c |
|
38 | $ echo c > c | |
@@ -48,11 +48,10 b' update source' | |||||
48 | $ darcs record -a -l -m p1.2 |
|
48 | $ darcs record -a -l -m p1.2 | |
49 | Finished recording patch 'p1.2' |
|
49 | Finished recording patch 'p1.2' | |
50 |
|
50 | |||
51 | $ darcs pull -a --no-set-default ../darcs-clone |
|
51 | $ darcs pull -q -a --no-set-default ../darcs-clone | |
52 |
Backing up ./a( |
|
52 | Backing up ./a(*) (glob) | |
53 | We have conflicts in the following files: |
|
53 | We have conflicts in the following files: | |
54 | ./a |
|
54 | ./a | |
55 | Finished pulling and applying. |
|
|||
56 | $ sleep 1 |
|
55 | $ sleep 1 | |
57 | $ echo e > a |
|
56 | $ echo e > a | |
58 | $ echo f > f |
|
57 | $ echo f > f |
General Comments 0
You need to be logged in to leave comments.
Login now