Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-extdiff.out
author Jim Hague <jim.hague@acm.org>
Fri, 09 Jan 2009 22:15:08 +0000
changeset 7618 6c89dd0a7797
parent 6336 4b0c9c674707
child 7758 e81e6c996e99
permissions -rw-r--r--
Bugzilla 2.18 and on use contrib/sendbugmail.pl, not processmail. During 2.17, Bugzilla ditched the old 'processmail' script. With 2.18 contrib/sendbugmail.pl arrived in its place. For notification emails to work properly, sendbugmail.pl requires as its second parameter the Bugzilla user who made the commit. Otherwise the user will not be recognised as the committer, and will receive notification emails about the commit regardless of their preference about being notified on their own commits. This parameter should be given to processmail also, but wasn't for historical reasons. Add new config with the local Bugzilla install directory, and provide defaults for the notify string which should work for most setups. Still permit notify string to be specified, and for backwards compatibility with any extant notify strings try first interpolating notify string with old-style single bug ID argument. Add new 2.18 support version to introduce sendbugmail.pl. In other words, this update should be backwards-compatible with existing installations, but offers simplified setup in most cases. And as a bonus Bugzilla notification emails will be dispatched correctly; notifiers will not receive an email unless configured to do so.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2906
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
adding a
5137
2be225ea5722 extdiff: do single file diffs from the wc with no copy
Brad Schick <schickb@gmail.com>
parents: 5136
diff changeset 
     2
 
adding b
3751
797c6e70092b Don't require a diff which accepts the -N option.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3330
diff changeset 
     3
 
Only in a: a
5137
2be225ea5722 extdiff: do single file diffs from the wc with no copy
Brad Schick <schickb@gmail.com>
parents: 5136
diff changeset 
     4
 
Only in a: b
2906
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     5
 
diffing a.000000000000 a
4730
eadfaa9ec487 Updated command tables in commands.py and hgext extensions.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4315
diff changeset 
     6
 
hg falabala [OPTION]... [FILE]...
2906
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 












453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     8


use 'echo' to diff repository (or selected files)













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




     9














453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    10


            Show differences between revisions for the specified













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    11


            files, using the 'echo' program.













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    12














453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    13


            When two revision arguments are given, then changes are













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    14


            shown between those revisions. If only one revision is













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    15


            specified then that revision is compared to the working













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    16


            directory, and, when no revisions are specified, the













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    17


            working directory files are compared to its parent.













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    18














453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    19


options:













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    20














453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    21


 -o --option   pass option to comparison program













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    22


 -r --rev      revision













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    23


 -I --include  include names matching the given patterns













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    24


 -X --exclude  exclude names matching the given patterns








4315






bc6f5a1d8b7b
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3751

diff
changeset




    25














bc6f5a1d8b7b
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 
3751

diff
changeset




    26


use "hg -v help falabala" to show global options








5137






2be225ea5722
extdiff: do single file diffs from the wc with no copy



Brad Schick <schickb@gmail.com>


parents: 
5136

diff
changeset




    27


diffing a.8a5febb7f867/a a.34eed99112ab/a








3330






49966b5ab16f
fix traceback of extdiff after a merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2912

diff
changeset




    28


1 files updated, 0 files merged, 0 files removed, 0 files unresolved








6336






4b0c9c674707
warn about new heads on commit (issue842)



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
5137

diff
changeset




    29


created new head








3330






49966b5ab16f
fix traceback of extdiff after a merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2912

diff
changeset




    30


1 files updated, 0 files merged, 1 files removed, 0 files unresolved













49966b5ab16f
fix traceback of extdiff after a merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2912

diff
changeset




    31


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













49966b5ab16f
fix traceback of extdiff after a merge



Benoit Boissinot <benoit.boissinot@ens-lyon.org>


parents: 
2912

diff
changeset




    32


(branch merge, don't forget to commit)








2912






8fd6925ae32f
Fixed test-extdiff.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2906

diff
changeset




    33


diff-like tools yield a non-zero exit code








5137






2be225ea5722
extdiff: do single file diffs from the wc with no copy



Brad Schick <schickb@gmail.com>


parents: 
5136

diff
changeset




    34


diffing a.34eed99112ab/c [tmp]/test-extdiff/a/c















Mercurial