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

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

bdiff: normalize the diff (issue1295)...
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).
Florent Guillaume - - Load All Authors

File last commit:

r6359:25e74cd3 default
r7104:9514cbb6 default
Show More
test-notify.out
66 lines | 1.4 KiB | text/plain | TextLexer
/ tests / test-notify.out
History | Source | Raw |Copy content |Copy permalink
Benoit Boissinot
fix hg help <ext> for extension that do not define any command...
 r4009 notify extension - No help text available
no commands defined
Matt Mackall
add test for the notify extension
 r3740 % commit
adding a
% clone
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Matt Mackall
add test for the notify extension
 r3740 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% commit
Alexis S. L. Carvalho
notify: don't try to fix addresses if notify.domain is not set
 r4094 % 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
Mathieu Clabaut
Add sending date to notify message....
 r4479 Date:
Alexis S. L. Carvalho
notify: don't try to fix addresses if notify.domain is not set
 r4094 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
Florent Guillaume
test-notify: make it pass on Mac OS X 10.5
 r6359 description: b
Alexis S. L. Carvalho
notify: don't try to fix addresses if notify.domain is not set
 r4094
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
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,2 @@
Alexis S. L. Carvalho
notify: don't try to fix addresses if notify.domain is not set
 r4094 a
+a
(run 'hg update' to get a working copy)
Patrick Mezard
ui: make readsections() abort when configuration cannot be read.
 r4517 % fail for config file is missing
rolling back last transaction
pull failed
Matt Mackall
add test for the notify extension
 r3740 % pull
Alexis S. L. Carvalho
notify: don't try to fix addresses if notify.domain is not set
 r4094 rolling back last transaction
Matt Mackall
add test for the notify extension
 r3740 pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Mathieu Clabaut
Add sending date to notify message....
 r4479 Date:
Matt Mackall
add test for the notify extension
 r3740 Subject: b
From: test@test.com
X-Hg-Notification: changeset 0647d048b600
Message-Id:
Alexis S. L. Carvalho
notify: don't try to fix addresses if notify.domain is not set
 r4094 To: baz@test.com, foo@bar
Matt Mackall
add test for the notify extension
 r3740
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
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,1 +1,2 @@
Matt Mackall
add test for the notify extension
 r3740 a
+a
(run 'hg update' to get a working copy)