Mercurial > hg
view tests/test-remotefilelog-wireproto.t @ 41930:cbdd2b56d4c3
copies: add test that makes both the merging csets dirty and run w/o error
This series of patches is to cover a case in fullcopytracing algorithms
where both the merging csets are not descendant of merge base.
In this algorithm we call a merging cset "dirty" if that cset is not the
descendant of merge base. That said, added test in this patch cover case
when both the merging csets are "dirty".
Actually this case of "both dirty" was encountered by Pulkit when he was
working on content-divergence where it is possible that both the csets
are not descendant of merging base.
For reference you can look into: https://phab.mercurial-scm.org/D3896
As this test run fine without any error and correctly traced the copies, I
added this test to make sure that it doesn't break even after I will modify
some code in next patches to fix an error. Next patch adds the tests where
this algorithm throws an error for the same case of "both dirty".
Differential Revision: https://phab.mercurial-scm.org/D5961
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Thu, 14 Feb 2019 17:11:35 +0530 |
parents | 0800d9e6e216 |
children | dcaa2df1f688 |
line wrap: on
line source
#require no-windows $ . "$TESTDIR/remotefilelog-library.sh" $ hg init master $ cd master $ cat >> .hg/hgrc <<EOF > [remotefilelog] > server=True > EOF $ echo x > x $ hg commit -qAm x $ echo y >> x $ hg commit -qAm y $ echo z >> x $ hg commit -qAm z $ hg update 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo w >> x $ hg commit -qAm w $ cd .. Shallow clone and activate getflogheads testing extension $ hgcloneshallow ssh://user@dummy/master shallow --noupdate streaming all changes 2 files to transfer, 908 bytes of data transferred 908 bytes in * seconds (*/sec) (glob) searching for changes no changes found $ cd shallow $ cat >> .hg/hgrc <<EOF > [extensions] > getflogheads=$TESTDIR/remotefilelog-getflogheads.py > EOF Get heads of a remotefilelog $ hg getflogheads x 2797809ca5e9c2f307d82b1345e832f655fb99a2 ca758b402ddc91e37e3113e1a97791b537e1b7bb Get heads of a non-existing remotefilelog $ hg getflogheads y EMPTY