# HG changeset patch
# User Ryan McElroy <rmcel...@fb.com>
# Date 1519041042 28800
# Mon Feb 19 03:50:42 2018 -0800
# Node ID 7cee78e9b823b9671cbfff28086a0cb914a2edf0
# Parent 6b80188783ee2626030113a9b2319f2fd14a8119
tests: update with new hg output
diff --git a/tests/test-http.t b/tests/test-http.t
--- a/tests/test-http.t
+++ b/tests/test-http.t
@@ -23,6 +23,7 @@ clone
adding manifests
adding file changes
added 1 changesets with 4 changes to 4 files
+ new changesets 8b6053c928fe
updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-pull-rebase.t b/tests/test-pull-rebase.t
--- a/tests/test-pull-rebase.t
+++ b/tests/test-pull-rebase.t
@@ -84,6 +84,7 @@ Tests 'hg pull --rebase' defaults to ori
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+2 heads)
+ new changesets 7a820e70c81f:4557926d2166
updating to active bookmark bmnottracking
nothing to rebase
$ hg rebase -d 3
@@ -113,6 +114,7 @@ Tests the behavior of a pull followed by
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 550352cd8c78
(run 'hg update' to get a working copy)
$ hg pull --rebase
pulling from $TESTTMP/remoterepo (glob)
@@ -186,6 +188,7 @@ Test pull with --rebase and --tool
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files (+1 heads)
+ new changesets b1a3b9086dc9
(run 'hg heads .' to see heads, 'hg merge' to merge)
rebasing 6:1d01e32a0efb "somelocalchanges" (tracking2)
merging editedbyboth
diff --git a/tests/test-remotenames-with-aliases.t
b/tests/test-remotenames-with-aliases.t
--- a/tests/test-remotenames-with-aliases.t
+++ b/tests/test-remotenames-with-aliases.t
@@ -51,6 +51,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
+ new changesets 6cee5c8f3e5b:5b35a0d5bd4d
(run 'hg update' to get a working copy)
$ hg pull beta | $FILTERPWD
@@ -60,6 +61,7 @@
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
+ new changesets 5ae9f075bc64:a43aa1e4a27c
(run 'hg update' to get a working copy)
$ hg co -C default
diff --git a/tests/test-remotenames.t b/tests/test-remotenames.t
--- a/tests/test-remotenames.t
+++ b/tests/test-remotenames.t
@@ -57,6 +57,7 @@ Continue testing
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
+ new changesets 1f0dee641bb7:95cb4ab9fe1d
(run 'hg update' to get a working copy)
$ hg pull beta | $FILTERPWD
pulling from beta
@@ -65,6 +66,7 @@ Continue testing
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
+ new changesets 78f83396d79e:8948da77173b
(run 'hg update' to get a working copy)
$ hg co -C default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-schemes.t b/tests/test-schemes.t
--- a/tests/test-schemes.t
+++ b/tests/test-schemes.t
@@ -53,6 +53,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files
+ new changesets 1f0dee641bb7:95cb4ab9fe1d
(run 'hg update' to get a working copy)
$ hg pull beta | $FILTERPWD
pulling from dotdot://beta/
@@ -61,6 +62,7 @@
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
+ new changesets 78f83396d79e:8948da77173b
(run 'hg update' to get a working copy)
$ hg co -C default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-selective-pull.t b/tests/test-selective-pull.t
--- a/tests/test-selective-pull.t
+++ b/tests/test-selective-pull.t
@@ -24,6 +24,7 @@ Pull master bookmark
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 1449e7934ec1
(run 'hg update' to get a working copy)
$ hg bookmarks --remote
default/master 0:1449e7934ec1
@@ -44,7 +45,6 @@ Create another bookmark on the remote re
$ echo b >> a
$ hg add a
$ hg commit -m 'Commit secondbook points to'
- created new head
Do not pull new boookmark from local repo
$ cd ../localrepo
@@ -78,6 +78,7 @@ Move master bookmark
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 0238718db2b1
(run 'hg update' to get a working copy)
$ hg bookmarks --remote
default/master 1:0238718db2b1
@@ -90,6 +91,7 @@ Specify bookmark to pull
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
+ new changesets ed7a9fd254d1
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg bookmarks --remote
default/master 1:0238718db2b1
@@ -140,6 +142,7 @@ Move bookmark in first remote, pull and
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets c47dca9795c9
(run 'hg update' to get a working copy)
$ hg bookmarks --remote
default/master 1:0238718db2b1
@@ -188,6 +191,7 @@ Update to the remote bookmark from secon
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
+ new changesets 0022441e80e5
(run 'hg update' to get a working copy)
`secondremote/secondbook` found remotely
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
