Mercurial > hg
comparison tests/test-rename.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 | e8d10d085f47 |
children | 997ab9af81df |
comparison
equal
deleted
inserted
replaced
11222:e7adcef1504b | 11223:0d09f2244805 |
---|---|
2 A d2/c | 2 A d2/c |
3 d1/d11/a1 | 3 d1/d11/a1 |
4 R d1/d11/a1 | 4 R d1/d11/a1 |
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
6 # rename --after a single file | 6 # rename --after a single file |
7 A d2/c | |
8 d1/d11/a1 | |
9 R d1/d11/a1 | |
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 # rename --after a single file when src and tgt already tracked | |
12 removing d1/d11/a1 | |
13 adding d2/c | |
7 A d2/c | 14 A d2/c |
8 d1/d11/a1 | 15 d1/d11/a1 |
9 R d1/d11/a1 | 16 R d1/d11/a1 |
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 # rename --after a single file to a nonexistant target filename | 18 # rename --after a single file to a nonexistant target filename |