equal
deleted
inserted
replaced
55 hg branch é |
55 hg branch é |
56 hg ci -Aqm9 |
56 hg ci -Aqm9 |
57 |
57 |
58 hg tag -r6 1.0 |
58 hg tag -r6 1.0 |
59 |
59 |
|
60 hg clone --quiet -U -r 7 . ../remote1 |
|
61 hg clone --quiet -U -r 8 . ../remote2 |
|
62 echo "[paths]" >> .hg/hgrc |
|
63 echo "default = ../remote1" >> .hg/hgrc |
|
64 |
60 # names that should work without quoting |
65 # names that should work without quoting |
61 try a |
66 try a |
62 try b-a |
67 try b-a |
63 try _a_b_c_ |
68 try _a_b_c_ |
64 try _a_b_c_-a |
69 try _a_b_c_-a |
111 log 'limit(head(), 1)' |
116 log 'limit(head(), 1)' |
112 log 'max(contains(a))' |
117 log 'max(contains(a))' |
113 log 'min(contains(a))' |
118 log 'min(contains(a))' |
114 log 'merge()' |
119 log 'merge()' |
115 log 'modifies(b)' |
120 log 'modifies(b)' |
|
121 log 'outgoing()' |
|
122 log 'outgoing("../remote1")' |
|
123 log 'outgoing("../remote2")' |
116 log 'p1(merge())' |
124 log 'p1(merge())' |
117 log 'p2(merge())' |
125 log 'p2(merge())' |
118 log 'parents(merge())' |
126 log 'parents(merge())' |
119 log 'removes(a)' |
127 log 'removes(a)' |
120 log 'roots(all())' |
128 log 'roots(all())' |