Sorry for the long delay in getting back to you - for some reason your post
never reached me, and I only saw it because I was searching the mailing list
for something else.
On Tue, 11 Sep 2007 Tobias Schäfer wrote:
> On Tuesday 11 September 2007 14:26:02 Nikki Locke wrote:
> > Is it possible to specify a peg revision in Tortoise SVN?
> >
> > For instance, I would like a log of /branches/nikki@111.
>
> Open the repository browser and click on the revision button "HEAD". Change
> the revision to 111 and then navigate to /branches/nikki using the tree
> view.
Ah, thanks, that works (up to a point). It shows me changes at that peg
revision, up to and including the revision I choose. So it's not like a plain
SVN peg revision, which merely anchors the log, and gives a log for the whole
history, both forward and back from the peg. Which means, if I want the whole
history, I have to manually search for the revision where that branch was
deleted, and "peg" to the one before that.
> > I would also like to use a peg revision in a merge.
>
> TortoiseSVN should take care of this automatically - at least it does in the
> 1.4.99 nightly build by falling back to the revision range as the peg
> revision if HEAD as peg revision fails.
>
> Could you please try a nightly build and come back with an exact description
> if it still doesn't work.
Falling back to a peg revision if HEAD as peg revision fails is all very fine.
But in my case the HEAD peg revision won't fail.
I start with trunk
I copy this to branches/nikki at rev 10
I make a change to branches/nikki/File.cs at rev 12
I delete branches/nikki at rev 20
I copy trunk to branches/nikki at rev 21
I now want to merge the changes between revs 11 and 12 of a file in
branches/nikki. Unfortunately, the file exists in the current branches/nikki,
and has a perfectly valid history which goes back as far as revs 11 and 12
(when it was in trunk). Tortoise will find no changes (because trunk wasn't
changed between revs 11 and 12).
--
Nikki Locke, Trumphurst Ltd. PC & Unix consultancy & programming
http://www.trumphurst.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Oct 15 18:32:05 2007