Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-notify.out @ 5390:36c46e20976a
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 03 Oct 2007 23:09:36 +0200 |
parents | 5371a213b0f4 |
children |
line wrap: on
line source
notify extension - No help text available no commands defined % commit adding a % clone 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % commit % pull (minimal config) pulling from ../a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files Date: Subject: changeset in test-notify/b: b From: test X-Hg-Notification: changeset 0647d048b600 Message-Id: To: baz, foo@bar changeset 0647d048b600 in test-notify/b details: test-notify/b?cmd=changeset;node=0647d048b600 description: b diffs (6 lines): diff -r cb9a9f314b8b -r 0647d048b600 a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000 @@ -1,1 +1,2 @@ a a +a (run 'hg update' to get a working copy) % fail for config file is missing rolling back last transaction pull failed % pull rolling back last transaction pulling from ../a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files Date: Subject: b From: test@test.com X-Hg-Notification: changeset 0647d048b600 Message-Id: To: baz@test.com, foo@bar changeset 0647d048b600 description: b diffs (6 lines): diff -r cb9a9f314b8b -r 0647d048b600 a --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:01 1970 +0000 @@ -1,1 +1,2 @@ a a +a (run 'hg update' to get a working copy)