From: Sam Vilain <sam@vilain.net>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Eric Wong <normalperson@yhbt.net>,
Ramsay Jones <ramsay@ramsay1.demon.co.uk>,
GIT Mailing-list <git@vger.kernel.org>,
mhagger@alum.mit.edu
Subject: Re: [RFC/PATCH] t9159-*.sh: Don't use the svn '@<rev>' syntax
Date: Wed, 20 Jul 2011 17:59:55 +0100 [thread overview]
Message-ID: <4E27098B.906@vilain.net> (raw)
In-Reply-To: <4E269AB6.8070207@drmicha.warpmail.net>
On 20/07/11 10:07, Michael J Gruber wrote:
> path@REV are so-called peg revisions, introduced in svn 1.1, and denote
> "I mean the file named path in REV" (as opposed to "the file named path
> now and maybe differently back then"). It (now) defaults to BASE (for
> worktree) resp. HEAD (for URLs). A bit like our rename detection.
>
> -r REV specifies the operative revision. After resolving the
> name/location using the pegrev, the version at the resolved path at the
> oprative version is operated on.
>
> svn 1.5.0 (June 2008) introduced peg revisions to "svn copy", so I
> assume our people were following svn trunk and adjusting in 2007 already
> (to r22964). There were some fixes to "svn copy" with peg later on.
>
> I do not understand the above commit message at all; and I did not find
> anything about how "svn copy -r REV" acted in svn 1.4. I would assume
> "operative revision", and the above commit message seems to imply that
> peg defaulted to REV here (not HEAD) and that that changed in 1.5.0, but
> that is a wild guess (svnbook 1.4 does not so anything).
What happened is that I noticed that the code stopped working after svn
1.5 was released. Previously I wrote it to detect the merge properties
as left by SVK and the experimental/contrib python script for merging.
I was testing at times using trunk SVN versions. You could probably
figure it out by running ffab6268^ with svn 1.4.x vs svn 1.5.x if you
cared. My comment tries to explain what you describe above, but without
the correct terms. I could see via experimentation what the difference
was between "-r N" and '/path@N', and that the behaviour changed in svn
1.5. Apologies for not explaining this thoroughly enough in the
submitted description!
HTH,
Sam
next prev parent reply other threads:[~2011-07-20 17:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-16 18:04 [RFC/PATCH] t9159-*.sh: Don't use the svn '@<rev>' syntax Ramsay Jones
2011-07-19 19:58 ` Junio C Hamano
2011-07-20 9:07 ` Michael J Gruber
2011-07-20 16:59 ` Sam Vilain [this message]
2011-09-10 17:40 ` Ramsay Jones
2011-09-13 7:57 ` Eric Wong
2011-09-13 9:15 ` John Szakmeister
2011-09-13 17:14 ` Junio C Hamano
2011-07-20 9:10 ` Michael J Gruber
2011-07-20 13:29 ` Michael J Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E27098B.906@vilain.net \
--to=sam@vilain.net \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
--cc=normalperson@yhbt.net \
--cc=ramsay@ramsay1.demon.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.