You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Blair Zajac <bl...@orcaware.com> on 2006/08/21 16:04:32 UTC
Re: svn commit: r21142 - branches/1.4.x/subversion/libsvn_ra_serf
jerenkrantz@tigris.org wrote:
> Author: jerenkrantz
> Date: Mon Aug 21 08:44:30 2006
> New Revision: 21142
>
> Modified:
> branches/1.4.x/subversion/libsvn_ra_serf/README
>
> Log:
> Merge r21141 from trunk. (Doc change only, no code change.)
>
> * subversion/libsvn_ra_serf/README: Point at Serf's new home.
Hi Justin,
It appears that the svnmerge.py script wasn't used to do the merge, as the email
isn't showing a property diff on the branches/1.4.x directory.
I know it's a small merge, but can we either fix the merge information in the
property on branches/1.4.x or revert the merge by hand and then redo the merge
with svnmerge.py?
This is really more to get in the habit of using svnmerge.py :)
Thanks,
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r21142 - branches/1.4.x/subversion/libsvn_ra_serf
Posted by "C. Michael Pilato" <cm...@collab.net>.
Blair Zajac wrote:
>> On 8/21/06, Justin Erenkrantz <ju...@erenkrantz.com> wrote:
>>> I'm sorry, but I'm not going to use svnmerge.py anytime soon.
>>> Firstly, I don't have the python bindings installed as I don't have a
>>> recent enough SWIG for Subversion's liking. Secondly, there are no
>>> instructions in HACKING on how to use it that I can find.
>
> Good point on the HACKING document, we should update that.
HACKING is a good place. But at the very last, there should be a note in
the actual 1.4.x/STATUS file that indicates that svnmerge.py should be used
for all merges to the branch.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: svn commit: r21142 - branches/1.4.x/subversion/libsvn_ra_serf
Posted by Blair Zajac <bl...@orcaware.com>.
Garrett Rooney wrote:
> On 8/21/06, Justin Erenkrantz <ju...@erenkrantz.com> wrote:
>> On 8/21/06, Blair Zajac <bl...@orcaware.com> wrote:
>> > It appears that the svnmerge.py script wasn't used to do the merge,
>> as the email
>> > isn't showing a property diff on the branches/1.4.x directory.
>> >
>> > I know it's a small merge, but can we either fix the merge
>> information in the
>> > property on branches/1.4.x or revert the merge by hand and then redo
>> the merge
>> > with svnmerge.py?
>> >
>> > This is really more to get in the habit of using svnmerge.py :)
>>
>> I'm sorry, but I'm not going to use svnmerge.py anytime soon.
>> Firstly, I don't have the python bindings installed as I don't have a
>> recent enough SWIG for Subversion's liking. Secondly, there are no
>> instructions in HACKING on how to use it that I can find.
Good point on the HACKING document, we should update that.
Hopefully, by the time 1.5 comes out, we'll use svn's built in merge tracking
instead.
To download it
svn cat http://svn.collab.net/repos/svn/trunk/contrib/client-side/svnmerge.py >
svnmerge
chmod a+x svnmerge
You can look here for a one-page intro here on how use it:
http://www.orcaware.com/svn/wiki/index.php/Svnmerge.py
In this case, it would be:
svnmerge merge -r 21142
svn commit -F svnmerge-commit-message.txt
and the commit message in svnmerge-commit-message.txt is the commit message you
supplied to r21142.
> FWIW, svnmerge.py doesn't actually use the python bindings, it just
> calls the command line utilities.
>
>> IMHO, svnmerge.py should cope gracefully when people can't use it.
>> That's a critical requirement for any 'merge tracking' tool even when
>> we roll it out with 1.5: we're not going to be able to force everyone
>> to update their client to use these new features. -- justin
>
> It does cope reasonably gracefully, the revision will be listed as
> available for merge, and you'll get a conflict if you actually try to
> merge it (no surprise there), and there are commands you can run to
> tell svnmerge.py to simply record the merge in the properties, but not
> actually do the merge (since you've already done it). Something like:
>
> svnmerge.py merge -rWHATEVERREV --record-only
I was looking for that option. Yes, this would be the easiest fix.
Regards,
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r21142 - branches/1.4.x/subversion/libsvn_ra_serf
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 8/21/06, Justin Erenkrantz <ju...@erenkrantz.com> wrote:
> On 8/21/06, Blair Zajac <bl...@orcaware.com> wrote:
> > It appears that the svnmerge.py script wasn't used to do the merge, as the email
> > isn't showing a property diff on the branches/1.4.x directory.
> >
> > I know it's a small merge, but can we either fix the merge information in the
> > property on branches/1.4.x or revert the merge by hand and then redo the merge
> > with svnmerge.py?
> >
> > This is really more to get in the habit of using svnmerge.py :)
>
> I'm sorry, but I'm not going to use svnmerge.py anytime soon.
> Firstly, I don't have the python bindings installed as I don't have a
> recent enough SWIG for Subversion's liking. Secondly, there are no
> instructions in HACKING on how to use it that I can find.
FWIW, svnmerge.py doesn't actually use the python bindings, it just
calls the command line utilities.
> IMHO, svnmerge.py should cope gracefully when people can't use it.
> That's a critical requirement for any 'merge tracking' tool even when
> we roll it out with 1.5: we're not going to be able to force everyone
> to update their client to use these new features. -- justin
It does cope reasonably gracefully, the revision will be listed as
available for merge, and you'll get a conflict if you actually try to
merge it (no surprise there), and there are commands you can run to
tell svnmerge.py to simply record the merge in the properties, but not
actually do the merge (since you've already done it). Something like:
svnmerge.py merge -rWHATEVERREV --record-only
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r21142 - branches/1.4.x/subversion/libsvn_ra_serf
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
On 8/21/06, Blair Zajac <bl...@orcaware.com> wrote:
> It appears that the svnmerge.py script wasn't used to do the merge, as the email
> isn't showing a property diff on the branches/1.4.x directory.
>
> I know it's a small merge, but can we either fix the merge information in the
> property on branches/1.4.x or revert the merge by hand and then redo the merge
> with svnmerge.py?
>
> This is really more to get in the habit of using svnmerge.py :)
I'm sorry, but I'm not going to use svnmerge.py anytime soon.
Firstly, I don't have the python bindings installed as I don't have a
recent enough SWIG for Subversion's liking. Secondly, there are no
instructions in HACKING on how to use it that I can find.
IMHO, svnmerge.py should cope gracefully when people can't use it.
That's a critical requirement for any 'merge tracking' tool even when
we roll it out with 1.5: we're not going to be able to force everyone
to update their client to use these new features. -- justin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org