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

[merge-tracking]: Don't combine repos mergeinfo with local mergeinfo if the later is modified.

From: Paul Burba <pburba_at_collab.net>
Date: 2007-03-19 17:00:11 CET

One more time...with a patch



Attached is a patch addressing our recent IRC conversation regarding the
need to not combine repos mergeinfo with local mergeinfo when the latter
is modified. Per your suggestion I created a new secondary header file
in include/private/.

Please take a look if you have a moment and let me know if this is what
you had in mind.


Paul B.

On the merge-tracking branch: Don't combine repos with local merge info
when the latter is modified.

* subversion/include/private/svn_wc_private.h
  New file.
  (svn_wc__props_modified): Similar to svn_wc_props_modified_p()
  but also indicates the specific props that are modified and their
  new values.

* build.conf
  (libsvn_wc): Add private\svn_wc_private.h to msvc-export list.

* subversion/libsvn_client/diff.c
  Include private/svn_wc_private.h
  (get_wc_and_repos_merge_info): Use svn_wc__props_modified() to detect
  modified local merge info.
  local changes to merge info. Remove FIXME portion of comment.

* subversion/libsvn_wc/props.c
  (svn_wc__props_modified): New.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Mon Mar 19 17:00:26 2007

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.