equal
deleted
inserted
replaced
195 echo c > i1726r2/a |
195 echo c > i1726r2/a |
196 hg --cwd i1726r2 ci -m third |
196 hg --cwd i1726r2 ci -m third |
197 HGMERGE=true hg --cwd i1726r2 fetch ../i1726r1 | sed 's/new changeset 3:[0-9a-zA-Z]* /new changeset 3 /' |
197 HGMERGE=true hg --cwd i1726r2 fetch ../i1726r1 | sed 's/new changeset 3:[0-9a-zA-Z]* /new changeset 3 /' |
198 hg --cwd i1726r2 heads default --template '{rev}\n' |
198 hg --cwd i1726r2 heads default --template '{rev}\n' |
199 |
199 |
|
200 echo |
|
201 echo % test issue2047 |
|
202 hg -q init i2047a |
|
203 cd i2047a |
|
204 echo a > a |
|
205 hg -q ci -Am a |
|
206 hg -q branch stable |
|
207 echo b > b |
|
208 hg -q ci -Am b |
|
209 cd .. |
|
210 hg -q clone -r 0 i2047a i2047b |
|
211 cd i2047b |
|
212 hg fetch |
|
213 |
200 "$TESTDIR/killdaemons.py" |
214 "$TESTDIR/killdaemons.py" |
201 |
215 |
202 true |
216 true |