Mercurial > evolve
diff tests/test-topic-push.t @ 2120:e38156312410
tests: add glob for Windows
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 16 Mar 2017 23:17:07 -0400 |
parents | db617700d318 |
children | 3e339f6717c7 800463d6478c |
line wrap: on
line diff
--- a/tests/test-topic-push.t Tue Mar 21 11:58:55 2017 +0100 +++ b/tests/test-topic-push.t Thu Mar 16 23:17:07 2017 -0400 @@ -32,12 +32,12 @@ $ hg add aaa $ hg commit -m 'CA' $ hg outgoing -G - comparing with $TESTTMP/main + comparing with $TESTTMP/main (glob) searching for changes @ 0 default draft CA $ hg push - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes adding changesets adding manifests @@ -56,25 +56,25 @@ $ hg commit -m 'CC' created new head $ hg outgoing -G - comparing with $TESTTMP/main + comparing with $TESTTMP/main (glob) searching for changes @ 2 default draft CC o 1 default draft CB $ hg push - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes abort: push creates new remote head 9fe81b7f425d! (merge or see 'hg help push' for details about pushing new heads) [255] $ hg outgoing -r 'desc(CB)' -G - comparing with $TESTTMP/main + comparing with $TESTTMP/main (glob) searching for changes o 1 default draft CB $ hg push -r 'desc(CB)' - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes adding changesets adding manifests @@ -88,18 +88,18 @@ (branches are permanent and global, did you want a bookmark?) $ hg commit --amend $ hg outgoing -G - comparing with $TESTTMP/main + comparing with $TESTTMP/main (glob) searching for changes @ 4 mountain draft CC $ hg push - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes abort: push creates new remote branches: mountain! (use 'hg push --new-branch' to create new remote branches) [255] $ hg push --new-branch - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes adding changesets adding manifests @@ -110,7 +110,7 @@ Including on non-publishing $ hg push --new-branch draft - pushing to $TESTTMP/draft + pushing to $TESTTMP/draft (glob) searching for changes adding changesets adding manifests @@ -143,7 +143,7 @@ Pushing a new topic to a non publishing server should not be seen as a new head $ hg push draft - pushing to $TESTTMP/draft + pushing to $TESTTMP/draft (glob) searching for changes adding changesets adding manifests @@ -162,7 +162,7 @@ Pushing a new topic to a publishing server should be seen as a new head $ hg push - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes abort: push creates new remote head 67f579af159d! (merge or see 'hg help push' for details about pushing new heads) @@ -289,7 +289,7 @@ $ hg push draft - pushing to $TESTTMP/draft + pushing to $TESTTMP/draft (glob) searching for changes abort: push creates new remote head f0bc62a661be on branch 'default:babar'! (merge or see 'hg help push' for details about pushing new heads) @@ -333,7 +333,7 @@ Reject when pushing to draft $ hg push draft -r . - pushing to $TESTTMP/draft + pushing to $TESTTMP/draft (glob) searching for changes abort: push creates new remote head 4937c4cad39e! (merge or see 'hg help push' for details about pushing new heads) @@ -343,7 +343,7 @@ Reject when pushing to publishing $ hg push -r . - pushing to $TESTTMP/main + pushing to $TESTTMP/main (glob) searching for changes adding changesets adding manifests