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

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

fetch: do not count inactive branches when inferring a merge...
fetch: do not count inactive branches when inferring a merge The fetch extension would erroneously consider inactive branches when inferring which branches to merge. It now considers only active branches.
Jim Correia - - Load All Authors

File last commit:

r7762:fece056b default
r7854:423b4482 default
Show More
test-incoming-outgoing.out
405 lines | 8.5 KiB | text/plain | TextLexer
/ tests / test-incoming-outgoing.out
History | Annotation | Raw |Copy content |Copy permalink
adding foo
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 9 changesets, 9 total revisions
comparing with http://localhost/
changeset: 0:9cb21d99fe27
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0
changeset: 1:d717f5dfad6a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
changeset: 2:c0d6b86da426
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
changeset: 3:dfacbd43b3fe
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 3
changeset: 4:1f3a964b6022
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 4
changeset: 5:c028bcc7a28a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 5
changeset: 6:a0c0095f3389
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 6
changeset: 7:d4be65f4e891
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 7
changeset: 8:92b83e334ef8
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 8
comparing with http://localhost/
changeset: 0:9cb21d99fe27
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0
changeset: 1:d717f5dfad6a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
changeset: 2:c0d6b86da426
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
changeset: 3:dfacbd43b3fe
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 3
changeset: 4:1f3a964b6022
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 4
comparing with test
changeset: 0:9cb21d99fe27
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0
changeset: 1:d717f5dfad6a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
changeset: 2:c0d6b86da426
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
changeset: 3:dfacbd43b3fe
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 3
changeset: 4:1f3a964b6022
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 4
changeset: 5:c028bcc7a28a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 5
changeset: 6:a0c0095f3389
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 6
changeset: 7:d4be65f4e891
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 7
changeset: 8:92b83e334ef8
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 8
comparing with test
changeset: 0:9cb21d99fe27
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0
changeset: 1:d717f5dfad6a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
changeset: 2:c0d6b86da426
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
changeset: 3:dfacbd43b3fe
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 3
changeset: 4:1f3a964b6022
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 4
% limit to 2 changesets
comparing with test
changeset: 0:9cb21d99fe27
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0
changeset: 1:d717f5dfad6a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
% limit to 2 changesets, test with -p --git
comparing with test
changeset: 0:9cb21d99fe27
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0
diff --git a/foo b/foo
new file mode 100644
--- /dev/null
+++ b/foo
@@ -0,0 +1,1 @@
+0
changeset: 1:d717f5dfad6a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
diff --git a/foo b/foo
--- a/foo
+++ b/foo
@@ -1,1 +1,2 @@
0
+1
comparing with http://localhost/
changeset: 0:9cb21d99fe27
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0
changeset: 1:d717f5dfad6a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
changeset: 2:c0d6b86da426
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
changeset: 3:dfacbd43b3fe
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 3
changeset: 4:1f3a964b6022
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 4
changeset: 5:c028bcc7a28a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 5
changeset: 6:a0c0095f3389
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 6
changeset: 7:d4be65f4e891
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 7
changeset: 8:92b83e334ef8
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 8
comparing with test
changeset: 0:9cb21d99fe27
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 0
changeset: 1:d717f5dfad6a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 1
changeset: 2:c0d6b86da426
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 2
changeset: 3:dfacbd43b3fe
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 3
changeset: 4:1f3a964b6022
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 4
changeset: 5:c028bcc7a28a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 5
changeset: 6:a0c0095f3389
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 6
changeset: 7:d4be65f4e891
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 7
changeset: 8:92b83e334ef8
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 8
adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
(run 'hg update' to get a working copy)
adding changesets
adding manifests
adding file changes
added 9 changesets with 9 changes to 1 files
(run 'hg update' to get a working copy)
changeset: 8:92b83e334ef8
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 8
changeset: 8:92b83e334ef8
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 8
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 14 changesets, 14 total revisions
comparing with test
searching for changes
changeset: 9:3741c3ad1096
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 9
changeset: 10:de4143c8d9a5
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 10
changeset: 11:0e1c188b9a7a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 11
changeset: 12:251354d0fdd3
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 12
changeset: 13:bdaadd969642
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 13
% limit to 3 changesets
comparing with test
searching for changes
changeset: 9:3741c3ad1096
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 9
changeset: 10:de4143c8d9a5
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 10
changeset: 11:0e1c188b9a7a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 11
comparing with http://localhost/
searching for changes
changeset: 9:3741c3ad1096
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 9
changeset: 10:de4143c8d9a5
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 10
changeset: 11:0e1c188b9a7a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 11
changeset: 12:251354d0fdd3
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 12
changeset: 13:bdaadd969642
tag: tip
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 13
comparing with http://localhost/
searching for changes
changeset: 9:3741c3ad1096
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 9
changeset: 10:de4143c8d9a5
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 10
changeset: 11:0e1c188b9a7a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: 11