Re: Introducing SVN, best practices for people that work together without any version control

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Jan 31, 2005, at 11:25 PM, Jochen Wendebaum wrote:

> 1. first do the manual merge and then introduce svn
> 2. install svn, do the merge with svn
>
> If we do the merge with svn, how shall we proceed? Put both version
> into the db, or only one, and then merge them on a local copy?

Ideal situation would be this:

Put some common ancestor (the last release code, or after the last
merge) into the trunk. Make two branches, one for each developer,
check out the branches, and overlay the current code from each
developer into their branch, then commit.

Now the merges will have a common ancestor, which should make for
cleaner merges (3 way rather than 2 way), and the change history will
be complete.

- --
- -- Tom Mornini

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFB/8bvzaKkuvKwKvcRAmWZAJ9fSYHGYOPumWd5KVlePu3Elh2M/gCdFLY0
iQ8RI6WnhdoQHpTl5ntM+Ac=
=cbHR
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 1 19:16:27 2005