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

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

setup.py: skip inotify if there's no inotify_add_watch...
setup.py: skip inotify if there's no inotify_add_watch Debian Etch doesn't include a sys/inotify.h header, which makes it impossible to compile _inotify.c, making hg uninstallable. The cc.has_function() method is implemented by trying to compile a simple C program. Since there's no redirection involved all error messages are sent to the terminal. This is not particularly pretty but at least it allows the installation to complete.
Matt Mackall - - Load All Authors

File last commit:

r6004:5af5f0f9 default
r6245:0d0939b2 default
Show More
test-merge9.out
19 lines | 547 B | text/plain | TextLexer
/ tests / test-merge9.out
History | Source | Raw |Copy content |Copy permalink
Alexis S. L. Carvalho
merge: fix small bug with a failed merge across a rename...
 r4682 adding bar
adding foo
adding quux1
adding quux2
merging bar
merging bar failed!
merging foo and baz
Matt Mackall
merge: allow smarter tool configuration...
 r6004 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
Alexis S. L. Carvalho
merge: fix small bug with a failed merge across a rename...
 r4682 There are unresolved merges, you can redo the full merge using:
hg update -C 2
hg merge 1
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging bar
merging bar failed!
merging baz and foo
Matt Mackall
merge: allow smarter tool configuration...
 r6004 1 files updated, 1 files merged, 0 files removed, 1 files unresolved
Alexis S. L. Carvalho
merge: fix small bug with a failed merge across a rename...
 r4682 There are unresolved merges, you can redo the full merge using:
hg update -C 1
hg merge 2