tests/test-rebase-rename.out
author Alexander Solovyov <piranha@piranha.org.ua>
Mon, 27 Apr 2009 21:33:39 +0300
changeset 8264 63ea850b3312
parent 7954 b969611064ae
child 11197 4bb4895e1693
permissions -rw-r--r--
zeroconf: guess ip for Zeroconf Zeroconf() is actually pretty dumb in guessing IPs and in case of socket.gaierror will not guess right IP.

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