##// END OF EJS Templates
histedit: use base for computing renames when folding (issue3729)...
Martin Geisler -
r19392:f6b047cf stable
parent child Browse files
Show More
@@ -247,7 +247,7 b' def collapse(repo, first, last, commitop'
247 files.update(ctx.files())
247 files.update(ctx.files())
248
248
249 # Recompute copies (avoid recording a -> b -> a)
249 # Recompute copies (avoid recording a -> b -> a)
250 copied = copies.pathcopies(first, last)
250 copied = copies.pathcopies(base, last)
251
251
252 # prune files which were reverted by the updates
252 # prune files which were reverted by the updates
253 def samefile(f):
253 def samefile(f):
@@ -266,3 +266,37 b' dropped revision.'
266 +6
266 +6
267 $ cd ..
267 $ cd ..
268
268
269
270 Folding with initial rename (issue3729)
271 ---------------------------------------
272
273 $ hg init fold-rename
274 $ cd fold-rename
275 $ echo a > a.txt
276 $ hg add a.txt
277 $ hg commit -m a
278 $ hg rename a.txt b.txt
279 $ hg commit -m rename
280 $ echo b >> b.txt
281 $ hg commit -m b
282
283 $ hg logt --follow b.txt
284 2:e0371e0426bc b
285 1:1c4f440a8085 rename
286 0:6c795aa153cb a
287
288 $ hg histedit 1c4f440a8085 --commands - 2>&1 << EOF | fixbundle
289 > pick 1c4f440a8085 rename
290 > fold e0371e0426bc b
291 > EOF
292 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
293 reverting b.txt
294 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
295 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
296 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
297
298 $ hg logt --follow b.txt
299 1:cf858d235c76 rename
300 0:6c795aa153cb a
301
302 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now