##// END OF EJS Templates
copies-tests: clarify the description of the EA/AE cases...
marmoute -
r44940:275365d8 default
parent child Browse files
Show More
@@ -257,8 +257,8 b' Having another branch renaming a differe'
257
257
258
258
259 Merge:
259 Merge:
260 - one with change to an unrelated file
260 - the "e-" branch renaming b to f (through 'g')
261 - one deleting and recreating the change
261 - the "a-" branch renaming d to f (through e)
262
262
263 $ hg up 'desc("a-2")'
263 $ hg up 'desc("a-2")'
264 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
264 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -525,11 +525,11 b' This `hg log` output is correct'
525 A d
525 A d
526 R a
526 R a
527
527
528 Comparing with a merge re-adding the file afterward
528 Comparing with a merge with colliding rename
529 ---------------------------------------------------
529 --------------------------------------------
530
530
531 - one with change to an unrelated file
531 - the "e-" branch renaming b to f (through 'g')
532 - one deleting and recreating the change
532 - the "a-" branch renaming d to f (through e)
533
533
534 $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f'
534 $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f'
535 eb806e34ef6be4c264effd5933d31004ad15a793 644 f
535 eb806e34ef6be4c264effd5933d31004ad15a793 644 f
General Comments 0
You need to be logged in to leave comments. Login now