Mercurial > hg
view tests/test-empty-group @ 3918:a413f5c29c46
Fix test-hup for different output of ls on at least MacOS X and Solaris 8.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sat, 16 Dec 2006 23:24:30 +0100 |
parents | c0b449154a90 |
children | 7a7d4937272b |
line wrap: on
line source
#!/bin/sh # # A B # # 3 4 3 # |\/| |\ # |/\| | \ # 1 2 1 2 # \ / \ / # 0 0 # # if the result of the merge of 1 and 2 # is the same in 3 and 4, no new manifest # will be created and the manifest group # will be empty during the pull # # (plus we test a failure where outgoing # wrongly reported the number of csets) # hg init a cd a touch init hg ci -A -m 0 -d "1000000 0" touch x y hg ci -A -m 1 -d "1000000 0" hg update 0 touch x y hg ci -A -m 2 -d "1000000 0" hg merge 1 hg ci -A -m m1 -d "1000000 0" #hg log #hg debugindex .hg/store/00manifest.i hg update -C 1 hg merge 2 hg ci -A -m m2 -d "1000000 0" #hg log #hg debugindex .hg/store/00manifest.i cd .. hg clone -r 3 a b hg clone -r 4 a c hg -R a outgoing b hg -R a outgoing c hg -R b outgoing c hg -R c outgoing b hg -R b pull a hg -R c pull a