##// END OF EJS Templates
copies: remove existing copy info from the changeset on amend (BC)...
Martin von Zweigbergk -
r43127:57ea0a81 default
parent child Browse files
Show More
@@ -637,6 +637,9 b' class changelog(revlog.revlog):'
637 if extra is None and any(x is not None for x in extrasentries):
637 if extra is None and any(x is not None for x in extrasentries):
638 extra = {}
638 extra = {}
639 sortedfiles = sorted(files)
639 sortedfiles = sorted(files)
640 if extra is not None:
641 for name in ('p1copies', 'p2copies', 'filesadded', 'filesremoved'):
642 extra.pop(name, None)
640 if p1copies is not None:
643 if p1copies is not None:
641 extra['p1copies'] = encodecopies(sortedfiles, p1copies)
644 extra['p1copies'] = encodecopies(sortedfiles, p1copies)
642 if p2copies is not None:
645 if p2copies is not None:
@@ -140,11 +140,7 b' copy information on to the filelog'
140 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/dd7bb9581359-a6e6b6d2-amend.hg
140 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/dd7bb9581359-a6e6b6d2-amend.hg
141 $ hg changesetcopies
141 $ hg changesetcopies
142 files: j
142 files: j
143 filesadded: 0
144 filesremoved:
145
143
146 p1copies: 0\x00a (esc)
147 p2copies:
148 $ hg showcopies --config experimental.copies.read-from=filelog-only
144 $ hg showcopies --config experimental.copies.read-from=filelog-only
149 a -> j
145 a -> j
150 The entries should be written to extras even if they're empty (so the client
146 The entries should be written to extras even if they're empty (so the client
General Comments 0
You need to be logged in to leave comments. Login now