Mercurial > hg
view tests/test-merge8.t @ 41502:2f7408b7d247
tests: give up and make setsockopt() calls optional in the output
I can't figure out what causes these calls to happen or not, and I
weary of dealing with them. End the madness for now by marking them
all as optional lines of output.
Differential Revision: https://phab.mercurial-scm.org/D5762
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 30 Jan 2019 17:04:26 -0500 |
parents | eb586ed5d8ce |
children |
line wrap: on
line source
Test for changeset ba7c74081861 (update dirstate correctly for non-branchmerge updates) $ hg init a $ cd a $ echo a > a $ hg add a $ hg commit -m a $ cd .. $ hg clone a b updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd a $ hg mv a b $ hg commit -m move $ echo b >> b $ hg commit -m b $ cd ../b $ hg pull ../a pulling from ../a searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files new changesets e3c9b40284e1:772b37f1ca37 (run 'hg update' to get a working copy) $ hg update 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ cd ..