Mercurial > hg
view tests/test-merge8.t @ 36689:b394778b1a50 stable
test-subrepo: glob away an unstable hash
This is the instability mentioned at the beginning of the series. I don't like
hiding it, but I don't want to sit on a fix for a user reported problem while
trying to figure this out.
The instability seems related to the cset with a .hgsub with a remote URL.
(There's very little existing remote URL subrepo testing.)
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 03 Mar 2018 22:29:24 -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 ..