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

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

test-merge5: removed unnecessary parts of test...
test-merge5: removed unnecessary parts of test - no need to initialize a new directory - no need to fix the commit time, already done by run-tests - no need to exit 0, use exit code from hg instead - better spacing around comments
Pradeepkumar Gayam - - Load All Authors

File last commit:

r11976:b28fc3b3 default
r12155:94ad12aa default
Show More
test-merge2.t
53 lines | 1.2 KiB | text/troff | Tads3Lexer
/ tests / test-merge2.t
History | Annotation | Raw |Copy content |Copy permalink
$ mkdir t
$ cd t
$ hg init
$ echo This is file a1 > a
$ hg add a
$ hg commit -m "commit #0" -d "1000000 0"
$ echo This is file b1 > b
$ hg add b
$ hg commit -m "commit #1" -d "1000000 0"
$ rm b
$ hg update 0
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo This is file b2 > b
$ hg add b
$ hg commit -m "commit #2" -d "1000000 0"
created new head
$ cd ..; rm -r t
$ mkdir t
$ cd t
$ hg init
$ echo This is file a1 > a
$ hg add a
$ hg commit -m "commit #0" -d "1000000 0"
$ echo This is file b1 > b
$ hg add b
$ hg commit -m "commit #1" -d "1000000 0"
$ rm b
$ hg update 0
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo This is file b2 > b
$ hg commit -A -m "commit #2" -d "1000000 0"
adding b
created new head
$ cd ..; rm -r t
$ mkdir t
$ cd t
$ hg init
$ echo This is file a1 > a
$ hg add a
$ hg commit -m "commit #0" -d "1000000 0"
$ echo This is file b1 > b
$ hg add b
$ hg commit -m "commit #1" -d "1000000 0"
$ rm b
$ hg remove b
$ hg update 0
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo This is file b2 > b
$ hg commit -A -m "commit #2" -d "1000000 0"
adding b
created new head