view tests/test-rebase-rename.out @ 9929:193a8d539e21

merge with crew
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 24 Nov 2009 20:40:16 +0100
parents b969611064ae
children 4bb4895e1693
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
saving bundle to 

% 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
saving bundle to 

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