[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

merge peg revisions not working

From: getagrip <getagrip_at_web.de>
Date: Thu, 27 Aug 2009 11:21:13 +0200

I have read that tortoise is able to use peg-revisions out of the box,
but trying to merge a file which does not exist anymore (was renamed in
branch so all trunk changes are lost) does not work in tortoise when it
(see nr. 10 below which works in the commandline but not in tortoise):

initial structure =>

1. /trunk/merge.c

2. cd /trunk

3. svn cp /trunk /branch

4. // create local modifications in trunk and then
    svn ci merge.c -m "trunk changes"
    committed revision 10

5. svn sw /branch

6. svn mv merge.c branch_merge.c

7. svn ci -m "rename"
    committed revision 11

8. svn sw /trunk

9. svn merge /branch .
    D merge.c
    A branch_merge.c
    svn ci -m "merged from /branch and overlooked file rename/deletion"
    committed revision 12

10. // merging trunk changes that were lost in r12 back to /trunk_at_HEAD
    svn merge /trunk/merge.c_at_9 /trunk/merge.c_at_10 branch_merge.c
    svn ci -m "readded all lost changes from trunk"
    committed revision 13

Whenever I try to merge (nr. 10) in tortoise I get a "file not found:
revision n" error as the file which was renamed does not exist anymore.
I've tried to do the merge with the peg-rev syntax, without it, do a 2
url merge, just everything to no avail.
Any hints are very much appreciated.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-08-27 11:25:43 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.