You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Max Bowsher <ma...@ukf.net> on 2006/02/28 02:21:09 UTC
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
Re: svn commit: r18637 - branches/1.3.x-svnmerge.py/contrib/client-side
Posted by Blair Zajac <bl...@orcaware.com>.
Max Bowsher wrote:
> -----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.
I didn't want to list at least 27 revisions in the STATUS file :)
This makes it easier to merge in.
I could have listed in the STATUS file to merge all revisions from r17139 to
HEAD at the time for all those files, but we don't seem to do that. We list
revisions for many files, not entire revision ranges for several files.
Regards,
Blair
--
Blair Zajac, Ph.D.
<bl...@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org