Show More
@@ -194,7 +194,7 b' echo b > i1726r1/a' | |||||
194 | hg --cwd i1726r1 ci -m second |
|
194 | hg --cwd i1726r1 ci -m second | |
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] |
|
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 | "$TESTDIR/killdaemons.py" |
|
200 | "$TESTDIR/killdaemons.py" |
General Comments 0
You need to be logged in to leave comments.
Login now