##// END OF EJS Templates
graphlog: remove unused ASCIIDATA constant...
graphlog: remove unused ASCIIDATA constant It was introduced by d9acbe7b0049, returned by asciiformat() but never read anywhere. 20140c249e63 stopped using it completely, and the graphmod.CHANGESET type is passed through all functions.

File last commit:

r16536:63c817ea stable
r17164:8299a9ad default
Show More
test-merge4.t
25 lines | 654 B | text/troff | Tads3Lexer
Pradeepkumar Gayam
tests: unify test-merge4
r11977 $ hg init
$ echo This is file a1 > a
$ hg add a
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m "commit #0"
Pradeepkumar Gayam
tests: unify test-merge4
r11977 $ echo This is file b1 > b
$ hg add b
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m "commit #1"
Pradeepkumar Gayam
tests: unify test-merge4
r11977 $ hg update 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo This is file c1 > c
$ hg add c
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m "commit #2"
Pradeepkumar Gayam
tests: unify test-merge4
r11977 created new head
$ hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ rm b
$ echo This is file c22 > c
Patrick Mezard
commit: abort on merge with missing files...
r16536
Test hg behaves when committing with a missing file added by a merge
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m "commit #3"
Patrick Mezard
commit: abort on merge with missing files...
r16536 abort: cannot commit merge with missing files
[255]
Pradeepkumar Gayam
tests: unify test-merge4
r11977