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

RE: [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 16:30:34 CET

Disregard - sent accidentally while doing a past :-\

> -----Original Message-----
> From: Paul Burba [mailto:pburba@collab.net]
> Sent: Monday, March 19, 2007 11:29 AM
> To: SVN Dev; Daniel Rall
> Cc: Kamesh Jayachandran
> Subject: [merge-tracking]: Don't combine repos mergeinfo with
> local mergeinfo if the later is modified.
>
> Dan,
>
> 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 private
>
> ==============================================================
> ========++
> ++++++++
> [[[
> 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.
> ]]]
> ==============================================================
> ========++
> ++++++++
>
> Paul B.
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Mar 19 16:30:48 2007

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