facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 16:31:02 +03:00
Code Issues Projects Releases Wiki Activity
d5bf581a69
sapling/tests/test-extdiff.out

35 lines
1.2 KiB
Plaintext
Raw Normal View History

extdiff: fix bugs. add test.
2006-08-15 02:51:35 +04:00
adding a
extdiff: do single file diffs from the wc with no copy Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.
2007-08-07 01:50:57 +04:00
adding b
Don't require a diff which accepts the -N option.
2006-12-02 00:29:47 +03:00
Only in a: a
extdiff: do single file diffs from the wc with no copy Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.
2007-08-07 01:50:57 +04:00
Only in a: b
extdiff: fix bugs. add test.
2006-08-15 02:51:35 +04:00
diffing a.000000000000 a
Updated command tables in commands.py and hgext extensions. - Marked for translation where extensions already had _() - Corrected indentation - fixed a few synopsises
2007-06-27 00:38:57 +04:00
hg falabala [OPTION]... [FILE]...
extdiff: fix bugs. add test.
2006-08-15 02:51:35 +04:00
use 'echo' to diff repository (or selected files)
Show differences between revisions for the specified
files, using the 'echo' program.
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.
options:
-o --option pass option to comparison program
-r --rev revision
-I --include include names matching the given patterns
-X --exclude exclude names matching the given patterns
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output This should make it easier to discover global options. As a bonus, they are no longer displayed by something like a hg -v help dates
2007-04-07 11:27:55 +04:00
use "hg -v help falabala" to show global options
extdiff: do single file diffs from the wc with no copy Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.
2007-08-07 01:50:57 +04:00
diffing a.8a5febb7f867/a a.34eed99112ab/a
fix traceback of extdiff after a merge - files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff
2006-10-11 18:35:09 +04:00
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
warn about new heads on commit (issue842)
2008-03-21 13:06:02 +03:00
created new head
fix traceback of extdiff after a merge - files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff
2006-10-11 18:35:09 +04:00
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Fixed test-extdiff. diff-like tools usually return 1 if differences are found. Currently the extdiff returns 256, but that's a different topic (consolidating return code handling in hg).
2006-08-15 18:04:47 +04:00
diff-like tools yield a non-zero exit code
extdiff: do single file diffs from the wc with no copy Extdiff was always making a temporary directory and copying files even when not required. This change makes extdiff avoid the copy when diffing a single file that lives in the wc. This lets external diff tools edit the working copy file directly. It also lets other extensions resuse the functions in extdiff and get in-place diffs.
2007-08-07 01:50:57 +04:00
diffing a.34eed99112ab/c [tmp]/test-extdiff/a/c
Reference in New Issue Copy Permalink