Mercurial > hg
view tests/test-merge-local.out @ 9896:2c2f7593ffc4 stable
cmdutil.service: do not _exit(0) in the parent process
The fact that a parent process spawns a daemon does not necessarily means that
it is the only think it has to do. This was forcing since 7c01599dd340 inotify
processes launched implicitely to exit prematurely:
when no inotify server was running, "hg st" for example would only launch a
inotify server, _exit(0) and thus would not return file statuses.
This changeset adds a test for implicitely launched inotify processes.
Change to output of test-inotify-1208 is correct: it reflects the normal
error message of "hg st" when not dying during "hg inserve" daemon creation.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Tue, 17 Nov 2009 15:00:00 +0900 |
parents | a964ab624385 |
children | 6f1894d6a6b0 |
line wrap: on
line source
# revision 0 adding copy adding move adding remove adding unchanged adding zzz1_merge_ok adding zzz2_merge_bad # revision 1 # local changes to revision 0 4 files updated, 0 files merged, 3 files removed, 0 files unresolved --- a/zzz1_merge_ok +++ b/zzz1_merge_ok +new last line --- a/zzz2_merge_bad +++ b/zzz2_merge_bad +another last line M zzz1_merge_ok M zzz2_merge_bad # local merge with bad merge tool merging zzz1_merge_ok merging zzz2_merge_bad merging zzz2_merge_bad failed! 3 files updated, 1 files merged, 2 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges merging zzz1_merge_ok merging zzz2_merge_bad 2 files updated, 2 files merged, 3 files removed, 0 files unresolved --- a/zzz1_merge_ok +++ b/zzz1_merge_ok +new first line +new last line --- a/zzz2_merge_bad +++ b/zzz2_merge_bad +another last line M zzz1_merge_ok M zzz2_merge_bad # local merge with conflicts merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts during merge. merging zzz2_merge_bad failed! 3 files updated, 1 files merged, 2 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges merging zzz1_merge_ok merging zzz2_merge_bad 2 files updated, 2 files merged, 3 files removed, 0 files unresolved --- a/zzz1_merge_ok +++ b/zzz1_merge_ok +new first line +new last line --- a/zzz2_merge_bad +++ b/zzz2_merge_bad +another last line +======= +new last line M zzz1_merge_ok M zzz2_merge_bad # local merge without conflicts merging zzz1_merge_ok 4 files updated, 1 files merged, 2 files removed, 0 files unresolved --- a/zzz1_merge_ok +++ b/zzz1_merge_ok +new last line M zzz1_merge_ok ? zzz2_merge_bad.orig