Re: svn commit: r18637 - branches/1.3.x-svnmerge.py/contrib/client-side

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

blair@tigris.org wrote:
> Author: blair
> Date: Mon Feb 27 14:02:58 2006
> New Revision: 18637
>
> Modified:
> branches/1.3.x-svnmerge.py/contrib/client-side/svnmerge.README
> branches/1.3.x-svnmerge.py/contrib/client-side/svnmerge.py
> branches/1.3.x-svnmerge.py/contrib/client-side/svnmerge.sh
> branches/1.3.x-svnmerge.py/contrib/client-side/svnmerge_test.py
>
> Log:
> Merge in all changes in trunk to all the svnmerge* files starting from
> r17139, which was the last revision merged into the 1.3.x branch.
> This will bring the 1.3.x branch up to match trunk.

If this is a straightforward update, then why use a merge branch at all?

Merge branches are only required when conflicts would occur.

Max.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (Cygwin)

iD8DBQFEA7OUfFNSmcDyxYARArNvAJwNj20vnSjAjR4gafCurJtzXJsqogCfazn3
fiNVrUqVbzjwMVb3KgLNvXM=
=KkTu
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Feb 28 03:22:03 2006