##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Make test-pull work on slow machines, where hg serve needs some time to start.
Make test-pull work on slow machines, where hg serve needs some time to start.
Bryan O'Sullivan - - Load All Authors

File last commit:

r767:61ed30e8 default
r790:d7380783 default
Show More
test-merge2.out
49 lines | 862 B | text/plain | TextLexer
/ tests / test-merge2.out
History | Annotation | Raw |Copy content |Copy permalink
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg update 0
+ echo This is file b2
+ hg add b
+ hg commit -m 'commit #2' -d '0 0'
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg update 0
+ echo This is file b2
+ hg commit -A -m 'commit #2' -d '0 0'
adding b
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ rm b
+ hg remove b
+ hg update 0
+ echo This is file b2
+ hg commit -A -m 'commit #2' -d '0 0'
adding b
+ cd ..
+ /bin/rm -rf t