Mercurial > hg

comparison tests/test-rebase-rename.out @ 7954:b969611064ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: don't lose rename/copy data (Issue1423)
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
date Mon, 30 Mar 2009 18:26:32 +0200
parents
children 4bb4895e1693
comparison
equal deleted inserted replaced
7953:8c6f823efcc9 7954:b969611064ae
1 adding a
2 adding b
3 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4 created new head
5
6 % Rename is tracked
7 2:rename A
8 diff --git a/a b/a-renamed
9 rename from a
10 rename to a-renamed
11
12 % Rebase the revision containing the rename
13 saving bundle to
14
15 % Rename is not lost
16 2:rename A
17 diff --git a/a b/a-renamed
18 rename from a
19 rename to a-renamed
20
21 adding a
22 adding b
23 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
24 created new head
25
26 % Copy is tracked
27 2:copy A
28 diff --git a/a b/a-copied
29 copy from a
30 copy to a-copied
31
32 % Rebase the revision containing the copy
33 saving bundle to
34
35 % Copy is not lost
36 2:copy A
37 diff --git a/a b/a-copied
38 copy from a
39 copy to a-copied
40