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

editor v2 and replace

From: Neels Janosch Hofmeyr <neels_at_elego.de>
Date: Thu, 11 Jun 2009 03:23:56 +0200

Hi Greg,

IMHO it would be nice to have an svn_editor_cb_replace_t in editor v2.

I'm currently faced with a merge that replaces an item. The item is first
deleted and later added in a given merge range. Thus, merge first calls
file_deleted() and then file_added() (current "diff editor" callbacks).

That's a little awkward for

- displaying "R" instead of two lines "D" and "A" (diff --summarize?)

- making sense of a tree conflict. I'm currently fixing exactly this case,
where a merge replaces a file on top of a locally modified file. The current
code tries to create two tree-conflicts on the same item and fails.

It would need generic arguments for mixed node kinds...
If you agree, I'll be glad to add that, so you can review it to shreds ;)



Received on 2009-06-11 03:43:31 CEST

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.