tests/test-rebase-rename.out
author Simon Howkins <simonh@symbian.org>
Thu, 24 Jun 2010 15:18:47 +0100
branchstable
changeset 11441 d74fe370ab04
parent 11197 4bb4895e1693
permissions -rw-r--r--
cmdutil: only output style header once in non-buffered mode (issue2130)

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