view tests/test-rebase-rename.out @ 12404:f33a5d1c937e

test-subrepo-svn: restore expr functionality for solaris Cleanup in 22f3353bcc36 removed a syntactically incorrect and apparently unnecessary escape of / for expr - but solaris needs it.
author Mads Kiilerich <mads@kiilerich.com>
date Sat, 25 Sep 2010 02:35:35 +0200
parents 4bb4895e1693
children
line wrap: on
line source

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