view tests/test-rename-dir-merge @ 10620:1ee14abe07b4

shrink-revlog: instrument sort code to record statistics. Notably, count "suboptimal" nodes (predecessor is not first parent) and (with -v) report them at the end of the run.
author Greg Ward <greg-hg@gerg.ca>
date Tue, 09 Mar 2010 21:13:39 -0500
parents 6c82beaaa11a
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init

mkdir a
echo foo > a/a
echo bar > a/b
hg ci -Am "0"

hg co -C 0
hg mv a b
hg ci -m "1 mv a/ b/"

hg co -C 0
echo baz > a/c
echo quux > a/d
hg add a/c
hg ci -m "2 add a/c"

hg merge --debug 1
echo a/* b/*
hg st -C
hg ci -m "3 merge 2+1"
hg debugrename b/c

hg co -C 1
hg merge --debug 2
echo a/* b/*
hg st -C
hg ci -m "4 merge 1+2"
hg debugrename b/c