Re: [Gnu-arch-users] Re: subversion to arch gateway

[Andrew Suffield]

On Wed, Jan 05, 2005 at 11:02:31AM +0900, Miles Bader wrote:
> [This is not an ideal solution, as it only preserves changesets in the
> arch -> subversion direction.  This is mostly because the Subversion
> support is a quick hack on the original CVS script, but in general it
> seems like a hard problem to do it in both directions in the presence of
> any conflicts.]

*Never* allow conflicts in interface branches. Create one branch on
each side, solely for the purpose of reflecting one on the other
side. Other commits into these branches are *strictly*
forbidden. Merge from them, using the native merging tools.

Resist all temptation to combine the two pairs of branches into
one. It accomplishes nothing other than to make things extremely
difficult.

In a typical scenario it'll be something like this:

   foo-svn--main--0 <-------- (svn cow-orkers)
          |                          ^
          |                          |
          |                          |
          v                          |
   foo--main--0 ------------> (your svn branch)

The idiot cow-orkers commit only to the top right. You commit only to
the bottom left (merging from any cow-orkers using arch).

Conflicts are only possible along the two vertical lines, both of
which are native operations performed by hand.

-- 
  .''`.  ** Debian GNU/Linux ** | Andrew Suffield
 : :' :  http://www.debian.org/ |
 `. `'                          |
   `-             -><-          |

signature.asc
Description: Digital signature