Patchwork [1,of,2] test: drop useles --update flag in issue1502 tests

login
register
mail settings
Submitter Pierre-Yves David
Date Feb. 9, 2016, 7:16 p.m.
Message ID <f865f8c9b492bea4514b.1455045365@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/13068/
State Accepted
Delegated to: Martin von Zweigbergk
Headers show

Comments

Pierre-Yves David - Feb. 9, 2016, 7:16 p.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1454512871 0
#      Wed Feb 03 15:21:11 2016 +0000
# Node ID f865f8c9b492bea4514ba49c7c1cf2fa918f9a96
# Parent  54c896f8bb799e98f1bfe0a4eb087a72b7e7345d
# EXP-Topic destination
# Available At http://hg.netv6.net/marmoute-wip/mercurial/
#              hg pull http://hg.netv6.net/marmoute-wip/mercurial/ -r f865f8c9b492
test: drop useles --update flag in issue1502 tests

The --update is unrelated to the test and have no effect as it fails anyway.
Dropping it reduce the noise in the coming change in default destination for
update.

Patch

diff --git a/tests/test-issue1502.t b/tests/test-issue1502.t
--- a/tests/test-issue1502.t
+++ b/tests/test-issue1502.t
@@ -10,20 +10,18 @@  Initialize repository
   updating to branch default
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
   $ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
-  $ hg -R foo1 pull -u
+  $ hg -R foo1 pull
   pulling from $TESTTMP/foo (glob)
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  abort: not updating: not a linear update
-  (merge or update --check to force update)
-  [255]
+  (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg -R foo1 book branchy
   $ hg -R foo1 book
    * branchy                   1:e3e522925eff