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

tests: match upstream output

Browse Source
This commit is contained in:
Jun Wu 2017-10-17 15:24:27 -07:00
parent fbf22fd845
commit 955782ae2a
7 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/test-http.t
View File

@ -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

3
tests/test-pull-rebase.t
View File

@ -84,6 +84,7 @@ Tests 'hg pull --rebase' defaults to original (rebase->pullrebase) behaviour whe
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 a pull --rebase
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

1
tests/test-pushto.t
View File

@ -221,6 +221,7 @@ Test that rebasing and pushing works as expected
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
new changesets 1846eede8b68
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}\n'
o 2 b default/@

2
tests/test-remotenames-with-aliases.t
View File

@ -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

2
tests/test-remotenames.t
View File

@ -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

2
tests/test-schemes.t
View File

@ -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

5
tests/test-selective-pull.t
View File

@ -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
@ -78,6 +79,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 +92,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 +143,7 @@ Move bookmark in first remote, pull and make sure it moves in local repo
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 +192,7 @@ Update to the remote bookmark from secondremote
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