view tests/test-rebase-rename.out @ 8648:ca443bac7ed4

fixed 0xc0150004 error building Mercurial under Python 2.6 for Windows
author Garth Roxburgh-Kidd <garth@deadlybloodyserious.com>
date Thu, 28 May 2009 17:03:35 +0200
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