comparison tests/test-issue1175.t @ 44091:3df0bd706c40

graftcopies: use _filter() for filtering out invalid copies `graftcopies()` (formerly called `duplicatecopies()`) checked that the copy destination existed in the working copy, but it didn't check that copy source existed in the parent of the working copy. In `test-graft.t` we can see that as warnings about not finding ancestors of the copied files, and also empty commits getting created. This patch uses the existing `_filter()` function for filtering out invalid copies. In addition to the aforementioned types, that also includes copies where source and destination is the same. Differential Revision: https://phab.mercurial-scm.org/D7859
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 27 Dec 2019 15:14:19 -0800
parents 3a7efcbdf288
children 16c361152133
comparison
equal deleted inserted replaced
44090:2f0a44c69e07 44091:3df0bd706c40
80 $ hg resolve --mark b 80 $ hg resolve --mark b
81 (no more unresolved files) 81 (no more unresolved files)
82 continue: hg graft --continue 82 continue: hg graft --continue
83 $ hg graft --continue 83 $ hg graft --continue
84 grafting 1:5974126fad84 "b1" 84 grafting 1:5974126fad84 "b1"
85 warning: can't find ancestor for 'b' copied from 'a'!
86 $ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n' 85 $ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n'
87 changeset: 3:376d30ccffc0 86 changeset: 3:376d30ccffc0
88 summary: b1 87 summary: b1
89 88
90 changeset: 2:416baaa2e5e4 89 changeset: 2:416baaa2e5e4