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

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

dispatch: provide help for disabled extensions and commands...
dispatch: provide help for disabled extensions and commands Before a command is declared unknown, each extension in hgext is searched, starting with hgext.<cmdname>. If there's a matching command, a help message suggests the appropriate extension and how to enable it. Every extension could potentially be imported, but for cases like rebase, relink, etc. only one extension is imported. For the case of "hg help disabledext", if the extension is in hgext, the extension description is read and a similar help suggestion is printed. No extension import occurs.
Patrick Mezard - - Load All Authors

File last commit:

r9429:d8143769 default
r10364:de1e7099 default
Show More
test-merge1.out
64 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-merge1.out
History | Annotation | Raw |Copy content |Copy permalink
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
%% no merges expected
changeset: 1:4ee19afe4659
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: commit #1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
diff -r d9e5953b9dec b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+This is file b1
M b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
%% merge should fail
abort: untracked file in working directory differs from file in requested revision: 'b'
%% merge of b expected
merging for b
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
diff -r d9e5953b9dec b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+This is file b2
M b
%%
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
Contents of b should be "this is file b1"
This is file b1
%% merge fails
abort: outstanding uncommitted changes (use 'hg status' to list changes)
%% merge expected!
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
diff -r c1dd73cbf59f b
--- a/b
+++ b/b
@@ -1,1 +1,1 @@
-This is file b1
+This is file b22
M b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
%% merge of b should fail
abort: outstanding uncommitted changes (use 'hg status' to list changes)
%% merge of b expected
merging for b
merging b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
diff -r c1dd73cbf59f b
--- a/b
+++ b/b
@@ -1,1 +1,1 @@
-This is file b1
+This is file b33
M b