Mercurial Mercurial > hg > mercurial-crew-with-dirclash / 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 Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045 f191bc3916f7
parent 4730 eadfaa9ec487
child 5109 841568ccc09d
permissions -rw-r--r--
merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2891
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     1
 
adding a
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     2
 
making snapshot of 0 files from rev 000000000000
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     3
 
making snapshot of 1 files from working dir
3751
797c6e70092b Don't require a diff which accepts the -N option.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 3328
diff changeset 
     4
 
Only in a: a
2891
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     5
 
making snapshot of 0 files from rev 000000000000
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     6
 
making snapshot of 1 files from working dir
453097750fbf extdiff: fix bugs. add test.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset 
     7
 
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 
     8
 
hg falabala [OPTION]... [FILE]...
2891
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


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













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    11














453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    12


            Show differences between revisions for the specified













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    13


            files, using the 'echo' program.













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    14














453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    15


            When two revision arguments are given, then changes are













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    16


            shown between those revisions. If only one revision is













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    17


            specified then that revision is compared to the working













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    18


            directory, and, when no revisions are specified, the













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    19


            working directory files are compared to its parent.













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


options:













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    22














453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    23


 -o --option   pass option to comparison program













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    24


 -r --rev      revision













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    25


 -I --include  include names matching the given patterns













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    26


 -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




    27














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




    28


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








2891






453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    29


making snapshot of 1 files from rev e27a2475d60a













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    30


making snapshot of 1 files from rev 5e49ec8d3f05













453097750fbf
extdiff: fix bugs. add test.



Vadim Gelfer <vadim.gelfer@gmail.com>


parents: 

diff
changeset




    31


diffing a.e27a2475d60a a.5e49ec8d3f05








3328






49966b5ab16f
fix traceback of extdiff after a merge



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


parents: 
2897

diff
changeset




    32


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: 
2897

diff
changeset




    33


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: 
2897

diff
changeset




    34


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: 
2897

diff
changeset




    35


(branch merge, don't forget to commit)













49966b5ab16f
fix traceback of extdiff after a merge



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


parents: 
2897

diff
changeset




    36


making snapshot of 1 files from rev 5e49ec8d3f05













49966b5ab16f
fix traceback of extdiff after a merge



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


parents: 
2897

diff
changeset




    37


making snapshot of 1 files from working dir













49966b5ab16f
fix traceback of extdiff after a merge



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


parents: 
2897

diff
changeset




    38


diffing a.5e49ec8d3f05 a








2897






8fd6925ae32f
Fixed test-extdiff.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
2891

diff
changeset




    39


diff-like tools yield a non-zero exit code















mercurial-crew-with-dirclash