tests/test-rebase-rename.out
author Christian Ebert <blacktrash@gmx.net>
Sun, 26 Sep 2010 19:18:41 +0200
changeset 12495 6401e8547427
parent 11197 4bb4895e1693
permissions -rw-r--r--
test-keyword: fix typo, rephrase

adding a
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head

% Rename is tracked
2:rename A
diff --git a/a b/a-renamed
rename from a
rename to a-renamed

% Rebase the revision containing the rename

% Rename is not lost
2:rename A
diff --git a/a b/a-renamed
rename from a
rename to a-renamed

adding a
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head

% Copy is tracked
2:copy A
diff --git a/a b/a-copied
copy from a
copy to a-copied

% Rebase the revision containing the copy

% Copy is not lost
2:copy A
diff --git a/a b/a-copied
copy from a
copy to a-copied