I *am* using "merge two different trees".
I'm trying 'merge a range of revisions' as a work-around, but I'm
afraid to use it because I see different sets of versions depending on
whether I choose SVN Show Log from the explorer or click the Show Log
button in the merge dialog.
The Show Log button gives me these (an excerpt):
Revision: 5703
Author: rwhitehouse
Date: 5:01:12 PM, Thursday, August 07, 2008
Revision: 5701
Author: rwhitehouse
Date: 12:44:34 PM, Thursday, August 07, 2008
Revision: 5683
Author: rwhitehouse
Date: 6:22:18 PM, Tuesday, August 05, 2008
Revision: 5681
Author: rwhitehouse
Date: 4:38:33 PM, Tuesday, August 05, 2008
Revision: 5679
Author: rwhitehouse
Date: 1:51:29 PM, Tuesday, August 05, 2008
Revision: 5676
Author: rwhitehouse
Date: 11:45:58 AM, Tuesday, August 05, 2008
Revision: 5672
Author: rwhitehouse
Date: 5:37:52 PM, Monday, August 04, 2008
Revision: 5670
Author: rwhitehouse
Date: 3:31:54 PM, Monday, August 04, 2008
Revision: 5669
Author: rwhitehouse
Date: 1:49:19 PM, Monday, August 04, 2008
Revision: 5667
Author: rwhitehouse
Date: 10:50:01 AM, Monday, August 04, 2008
And I get this when I choose SVN Show Log from the explorer (again, an
excerpt):
Revision: 5696
Author: rwhitehouse
Date: 12:54:48 PM, Wednesday, August 06, 2008
Revision: 5686
Author: rwhitehouse
Date: 9:49:14 AM, Wednesday, August 06, 2008
Revision: 5685
Author: rwhitehouse
Date: 9:26:00 AM, Wednesday, August 06, 2008
Revision: 5665
Author: rwhitehouse
Date: 8:58:36 AM, Monday, August 04, 2008
Revision: 5641
Author: rwhitehouse
Date: 7:14:30 PM, Friday, July 18, 2008
Note that the numbers overlap but the same numbers don't appear in
what should be copies of the same log. Yes I've updated all the
directories several times. What gives? Why don't I see the same log in
both places?
On Aug 12, 1:14 pm, Stefan Küng <tortoise..._at_gmail.com> wrote:
> rwkit wrote:
> > My url is:
>
> > svn://10.0.0.3/opt/code/hosts/firewall/MC_Software/branches/EmbSkewDev
> > version:
>
> > 5628
>
> > Command:
> > Merging revisions of svn://10.0.0.3/opt/code/hosts/firewall/MC_Software/branches/EmbSkewDev
> > into C:\Development\Embedded\JazzRelease, respecting ancestry, Test
> > Only
>
> > I use the default settings of Compare Whitespace.
>
> > I am *pretty* sure that the merge was working before the upgrade. If
> > there is a possibility of a server issue, I'll need something to pass
> > on to the server guy, something to try or look for, or he's not going
> > to be much help.
>
> You're using the 'merge a range of revisions', but you haven't specified
> any revisions to merge.
> Either specify the revisions you want to merge, or use 'merge two
> different trees'.
>
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest Interface to (Sub)Version Control
> /_/ \_\ http://tortoisesvn.net
>
> signature.asc
> < 1KViewDownload
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org
Received on 2008-08-13 07:04:47 CEST