[SM-Discuss] SVN as p4 replacement
Pieter Lenaerts
e-type at sourcemage.org
Wed Mar 15 17:31:17 EST 2006
Op wo, 15-03-2006 te 19:05 +0100, schreef Arwed von Merkatz:
> On Wed, Mar 15, 2006 at 06:46:25PM +0100, Pieter Lenaerts wrote:
> > edit devel
> > $ svn commit
> > $ svn merge -r committed:head devel/section/spell test/section/spell
> > $ svn commit
> >
> > and done :)
>
> This is _one_ merge, now how does this work if several other gurus now
> edit the spell in devel, then I want to integrate that new version to
> test?
assuming multiple developers edit the same file at the same time, but at
different lines (WC = working copy)
WC1: svn update
WC2: svn update
WC1: edit devel
WC2: edit devel
WC1: svn commit
WC2: svn commit -> complains that file is out of date
WC2: svn update -> assuming no overlap, so this merges fine
WC2: svn commit
WC3: svn update -> this gives commits from 1 and 2 in WC3
WC3: svn merge -r committed:head devel/section/spell test/section/spell
WC3: svn commit
done :)
if a line is concurrently edited by multiple developers there will of
course be a conflict.
--
Pieter Lenaerts
Source Mage GNU/Linux
http://www.sourcemage.org
"Linux so advanced it may well be magic"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: Dit berichtdeel is digitaal ondertekend
Url : http://lists.ibiblio.org/pipermail/sm-discuss/attachments/20060315/6042baf3/attachment.bin
More information about the SM-Discuss
mailing list