[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Enabling full delete reporting for merge

From: Bert Huijben <bert_at_qqmail.nl>
Date: Thu, 24 Jan 2013 00:26:26 +0100


You might have noticed a few recent patches on the repository diff editor
tweaking the delete support to exactly report what nodes should be deleted.

My current patch for this is attached to this e-mail.

This patch makes the merge code handle every separate delete literally depth
first: all the files/subdirs before the directory.

Without further tweaks to the merge support this appears to cause a few more
tree conflicts than desirable. But I think this support is necessary to
resolve a class of tree conflict issues that wasn't handled before:
verifying if the right tree will be deleted.

I would welcome feedback.


* subversion/libsvn_client/merge.c
  (drive_merge_report_editor): Request walking deleted directories.

* subversion/tests/cmdline/*
   Fix expected results.

Received on 2013-01-24 00:27:14 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.