Mercurial > hg
view tests/test-empty-group @ 11223:0d09f2244805
rename: make --after work if source is already in R state
I routinely want to use `hg addrem` and then fix up missed renames
manually using `hg mv -A`. This patch allows me to record such
renames from a source in state R to a target in state A.
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Wed, 26 May 2010 16:16:47 +0200 |
parents | 7a7d4937272b |
children | 4c94b6d0fb1c |
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