sapling/tests/test-rebase-rename.out
2010-05-19 19:46:39 -05:00

39 lines
652 B
Plaintext

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