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

Re: Two-Site Subversion Repository Setup Ideas

From: Heinrichs, Dirk <dirk.heinrichs_at_capgemini.com>
Date: Mon, 6 Jun 2011 15:17:49 +0200

Am Montag, den 06.06.2011, 07:52 -0500 schrieb Les Mikesell:

> If you are doing this in 2 directions, won't the disconnected
> repositories eventually drift out of sync as the people resolving
> conflicts make different choices - regardless of how well the VCS
> manages the details?

I guess you're talking about conflicts in the code? This can be handled
by working on branches. If each task is done in its own branch, on which
only one person should work, then conflict resolution is only needed
when the branch is rebased to the latest tag (which is usually done by
the person responsible for the branch). Merging the branch back to trunk
(--reintegrate) is then conflict-free.



Firma: Capgemini Deutschland GmbH
Geschaeftsfuehrer: Dr. Michael Schulte (Vorsitzender), Sven Breipohl, Burkhard Kehrbusch, Peter Laggner, Josef Ranner
Amtsgericht Berlin-Charlottenburg, HRB 98814

This message contains information that may be privileged or confidential and is the property of the Capgemini Group. It is
intended only for the person to whom it is addressed. If you are not the intended recipient, you are not authorized to
read, print, retain, copy, disseminate, distribute, or use this message or any part thereof. If you receive this message
in error, please notify the sender immediately and delete all copies of this message.
Received on 2011-06-06 15:18:36 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.