Lines Matching refs:ancestor
38 func (r *reconciler) reconcile(path string, ancestor, alpha, beta *Entry) {
43 ancestorContents := ancestor.GetContents()
56 if !ancestor.equalShallow(alpha) {
82 r.handleDisagreementBidirectional(path, ancestor, alpha, beta)
84 r.handleDisagreementBidirectional(path, ancestor, alpha, beta)
86 r.handleDisagreementUnidirectional(path, ancestor, alpha, beta)
88 r.handleDisagreementUnidirectional(path, ancestor, alpha, beta)
94 func (r *reconciler) handleDisagreementBidirectional(path string, ancestor, alpha, beta *Entry) {
101 alphaDelta := diff(path, ancestor, alpha)
105 Old: ancestor,
110 betaDelta := diff(path, ancestor, beta)
114 Old: ancestor,
170 func (r *reconciler) handleDisagreementUnidirectional(path string, ancestor, alpha, beta *Entry) {
191 betaDeltaNonDeletion := nonDeletionChangesOnly(diff(path, ancestor, beta))
260 ancestorOrBetaNonDirectory := ancestor == nil ||
261 ancestor.Kind != EntryKind_Directory ||
265 if ancestor != nil {
289 alphaDelta := diff(path, ancestor, alpha)
302 ancestor, alpha, beta *Entry, argument
311 r.reconcile("", ancestor, alpha, beta)