view tests/test-issue619.out @ 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 6e65b451b62e
children 6f1d1ed3e19a
line wrap: on
line source

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
abort: can't merge with ancestor
done