equal
deleted
inserted
replaced
42 echo % merge branch |
42 echo % merge branch |
43 darcs pull -a ../darcs-clone |
43 darcs pull -a ../darcs-clone |
44 sleep 1 |
44 sleep 1 |
45 echo e > a |
45 echo e > a |
46 echo f > f |
46 echo f > f |
|
47 mkdir dir |
|
48 echo d > dir/d |
|
49 echo d > dir/d2 |
47 darcs record -a -l -m p2 |
50 darcs record -a -l -m p2 |
48 |
51 |
49 echo % test file and directory move |
52 echo % test file and directory move |
50 darcs mv f ff |
53 darcs mv f ff |
|
54 # Test remove + move |
|
55 darcs remove dir/d2 |
|
56 rm dir/d2 |
|
57 darcs mv dir dir2 |
51 darcs record -a -l -m p3 |
58 darcs record -a -l -m p3 |
52 cd .. |
59 cd .. |
53 |
60 |
54 glog() |
61 glog() |
55 { |
62 { |