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

Re: [BUG] Merge dialog peg revisions

From: Kyle George <kgeorge_at_tcpsoft.com>
Date: 2007-04-01 04:59:21 CEST

On Sat, 31 Mar 2007, Stefan Küng wrote:

> Fixed "Diff" in revision 9094.
> But the "Show Log" works for me just fine. At least if the "From" part also
> has the revision set to a value before the url was deleted.


Well, "Show Log" works fine on the to a target sides, but on the from side
it does not, at least for me. Here's a recipe:

From the command line:

cd \
mkdir test
cd test
svnadmin create repo
svn co file:///test/repo wc
cd wc
svn mkdir trunk tags branches
svn ci -m "dirs"
cd trunk
copy con x.txt
this is x.txt^Z<enter>
svn add x.txt
svn ci -m "file"
cd ..
svn cp trunk branches/mybranch
svn ci -m "branch"
cd branches\mybranch
copy con x.txt
this is x.txt in the branch^Z<enter><Overwrite x.txt? (Yes/No/All): y>
svn ci -m "branch change"
cd ..
svn update
svn del mybranch
svn ci -m "deleting mybranch" # now at rev 5
cd ..
svn update

From TortoiseSVN:

Navigate in explorer to test\wc\trunk
Right click on trunk, TortoiseSVN-->Merge
Set From: file:///test/repo/branches/mybranch, Revision: 4
Set To: file:///test/repo/trunk, Revision: HEAD

Now try Show Log on all three places (From, To, Target/Result). To and
Target/Result work, but From does not. branches/mybranch exists in r4, so
this should work.

Kyle George

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sun Apr 1 09:01:12 2007

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

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