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

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

Issue919: add a standard extension to recreate hardlinks between repositories....
Issue919: add a standard extension to recreate hardlinks between repositories. Having to run a standalone Python script from the contrib dir is a nuisance. Also makes various improvements to locking, file discovery, etc. Should also update: http://www.selenic.com/mercurial/wiki/index.cgi/RecreateHardlinksBetweenRepositories
Martin Geisler - - Load All Authors

File last commit:

r9050:77324df8 default
r9729:aa9ccab5 default
Show More
test-extdiff.out
70 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-extdiff.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906 adding a
Brad Schick
extdiff: do single file diffs from the wc with no copy...
 r5137 adding b
Thomas Arendsen Hein
Don't require a diff which accepts the -N option.
 r3751 Only in a: a
Brad Schick
extdiff: do single file diffs from the wc with no copy...
 r5137 Only in a: b
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906 diffing a.000000000000 a
Thomas Arendsen Hein
Updated command tables in commands.py and hgext extensions....
 r4730 hg falabala [OPTION]... [FILE]...
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906
use 'echo' to diff repository (or selected files)
Martin Geisler
extdiff: fix indentation and use gettext
 r9050 Show differences between revisions for the specified files, using the
'echo' program.
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906
Martin Geisler
extdiff: fix indentation and use gettext
 r9050 When two revision arguments are given, then changes are shown between
those revisions. If only one revision is specified then that revision is
compared to the working directory, and, when no revisions are specified,
the working directory files are compared to its parent.
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906
options:
-o --option pass option to comparison program
-r --rev revision
Gilles Moris
extdiff: add --change option to display single changeset diff...
 r7758 -c --change change made by revision
Vadim Gelfer
extdiff: fix bugs. add test.
 r2906 -I --include include names matching the given patterns
-X --exclude exclude names matching the given patterns
Alexis S. L. Carvalho
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
 r4315
use "hg -v help falabala" to show global options
Brad Schick
extdiff: do single file diffs from the wc with no copy...
 r5137 diffing a.8a5febb7f867/a a.34eed99112ab/a
Benoit Boissinot
fix traceback of extdiff after a merge...
 r3330 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Benoit Boissinot
fix traceback of extdiff after a merge...
 r3330 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Gilles Moris
extdiff: add --change option to display single changeset diff...
 r7758 diffing a.2a13a4d2da36/a [tmp]/test-extdiff/a/a
diffing a.8a5febb7f867/a a.34eed99112ab/a
diffing a.2a13a4d2da36/a a.46c0e4daeb72/a
Thomas Arendsen Hein
Fixed test-extdiff....
 r2912 diff-like tools yield a non-zero exit code
Patrick Mezard
extdiff: preserve execute-bit across copies (issue1562)...
 r8065
% test extdiff of multiple files in tmp dir:
% diff in working directory, before
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-a
+changed
diff --git a/b b/b
old mode 100644
new mode 100755
--- a/b
+++ b/b
@@ -1,1 +1,1 @@
-b
+changed
% edit with extdiff -p
% diff in working directory, after
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
-a
+changed
+edited
diff --git a/b b/b
old mode 100644
new mode 100755
--- a/b
+++ b/b
@@ -1,1 +1,2 @@
-b
+changed
+edited