Show More
@@ -7,6 +7,8 b'' | |||||
7 | > changesetcopies = log -r . -T 'files: {files} |
|
7 | > changesetcopies = log -r . -T 'files: {files} | |
8 | > {extras % "{ifcontains("copies", key, "{key}: {value}\n")}"}' |
|
8 | > {extras % "{ifcontains("copies", key, "{key}: {value}\n")}"}' | |
9 | > showcopies = log -r . -T '{file_copies % "{source} -> {name}\n"}' |
|
9 | > showcopies = log -r . -T '{file_copies % "{source} -> {name}\n"}' | |
|
10 | > [extensions] | |||
|
11 | > rebase = | |||
10 | > EOF |
|
12 | > EOF | |
11 |
|
13 | |||
12 | Check that copies are recorded correctly |
|
14 | Check that copies are recorded correctly | |
@@ -133,3 +135,24 b' Test writing only to filelog' | |||||
133 | a -> k |
|
135 | a -> k | |
134 |
|
136 | |||
135 | $ cd .. |
|
137 | $ cd .. | |
|
138 | ||||
|
139 | Test rebasing a commit with copy information | |||
|
140 | ||||
|
141 | $ hg init rebase-rename | |||
|
142 | $ cd rebase-rename | |||
|
143 | $ echo a > a | |||
|
144 | $ hg ci -Aqm 'add a' | |||
|
145 | $ echo a2 > a | |||
|
146 | $ hg ci -m 'modify a' | |||
|
147 | $ hg co -q 0 | |||
|
148 | $ hg mv a b | |||
|
149 | $ hg ci -qm 'rename a to b' | |||
|
150 | $ hg rebase -d 1 --config rebase.experimental.inmemory=yes | |||
|
151 | rebasing 2:55d0b405c1b2 "rename a to b" (tip) | |||
|
152 | merging a and b to b | |||
|
153 | saved backup bundle to $TESTTMP/rebase-rename/.hg/strip-backup/55d0b405c1b2-78df867e-rebase.hg | |||
|
154 | BROKEN: should show the rename | |||
|
155 | $ hg st --change . --copies | |||
|
156 | A b | |||
|
157 | R a | |||
|
158 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now