equal
deleted
inserted
replaced
6 |
6 |
7 initialize darcs repo |
7 initialize darcs repo |
8 |
8 |
9 $ mkdir darcs-repo |
9 $ mkdir darcs-repo |
10 $ cd darcs-repo |
10 $ cd darcs-repo |
11 $ darcs init |
11 $ darcs init -q |
12 $ echo a > a |
12 $ echo a > a |
13 $ darcs record -a -l -m p0 |
13 $ darcs record -a -l -m p0 |
14 Finished recording patch 'p0' |
14 Finished recording patch 'p0' |
15 $ cd .. |
15 $ cd .. |
16 |
16 |
41 |
41 |
42 $ darcs pull -q -a --no-set-default ../darcs-clone |
42 $ darcs pull -q -a --no-set-default ../darcs-clone |
43 Backing up ./a(*) (glob) |
43 Backing up ./a(*) (glob) |
44 We have conflicts in the following files: |
44 We have conflicts in the following files: |
45 ./a |
45 ./a |
|
46 (?) |
46 $ sleep 1 |
47 $ sleep 1 |
47 $ echo e > a |
48 $ echo e > a |
48 $ echo f > f |
49 $ echo f > f |
49 $ mkdir dir |
50 $ mkdir dir |
50 $ echo d > dir/d |
51 $ echo d > dir/d |
52 $ darcs record -a -l -m p2 |
53 $ darcs record -a -l -m p2 |
53 Finished recording patch 'p2' |
54 Finished recording patch 'p2' |
54 |
55 |
55 test file and directory move |
56 test file and directory move |
56 |
57 |
57 $ darcs mv f ff |
58 $ darcs mv -q f ff |
58 |
59 |
59 Test remove + move |
60 Test remove + move |
60 |
61 |
61 $ darcs remove dir/d2 |
62 $ darcs remove -q dir/d2 |
62 $ rm dir/d2 |
63 $ rm dir/d2 |
63 $ darcs mv dir dir2 |
64 $ darcs mv -q dir dir2 |
64 $ darcs record -a -l -m p3 |
65 $ darcs record -a -l -m p3 |
65 Finished recording patch 'p3' |
66 Finished recording patch 'p3' |
66 |
67 |
67 The converter does not currently handle patch conflicts very well. |
68 The converter does not currently handle patch conflicts very well. |
68 When they occur, it reverts *all* changes and moves forward, |
69 When they occur, it reverts *all* changes and moves forward, |