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

Re: [PATCH] svn_fs_commit_txn

From: Yoshiki Hayashi <yoshiki_at_xemacs.org>
Date: 2001-03-07 07:28:23 CET

Karl Fogel <kfogel@galois.ch.collab.net> writes:

> Yoshiki, have you read the section "Merge rules" in
> libsvn_fs/structure, or looked at the interface to svn_fs_merge() in
> svn_fs.h?

Yeah, I've read it. My interpreteation is that svn_fs_merge
should be called by an editor when svn_fs_commit_txn returns
SVN_ERR_FS_CONFLICT error. If svn_fs_commit_txn
automatically calls svn_fs_merge, there's no way to return
conflict_p to the caller of svn_fs_commit_txn.

do
  commit_retval = svn_fs_commit_txn
    if commit_retval equals SVN_ERR_FS_CONFLICT
      do
        retval = svn_fs_merge (merge differences between
                               base and latest fs revision)
        if retval equals SVN_ERR_FS_CONFLICT
          do something to resolve conflict (possibly with user interaction?)
          or abort the svn transaction
      while retval equals SVN_ERR_FS_CONFLICT
while commit_retval equals SVN_ERR_FS_CONFLICT

is how I see resolving conflict works.

-- 
Yoshiki Hayashi
Received on Sat Oct 21 14:36:25 2006

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