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

RE: [TSVN] Re: Merge dialog, second attempt

From: Hughes, Bill <Bill.Hughes_at_cox.co.uk>
Date: 2005-01-25 16:39:19 CET

Lübbe Onken wrote:
..snip..
> How about this:
> We created the branch when trunk was in revision 36. This
> causes the copy
> operation (create branch) to create revision 37. So revision 37 is
> pointing to the branch you just created and revision 36 is pointing to
> trunk on which
> work is continuing (r38, r39, ..., r50). If you now want to
> merge your trunk
> changes into branch, you have to select 36 as the from
> revision, because
> that's the point in time when the development was split into trunk and
> branch. If you want to merge everything up to revision 50,
> the range you
> have to enter is 36-50.

I like that, it's nice, clear and coherent.
I think it should go in the docs.

Bill

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
This e-mail transmission is strictly confidential and intended solely
for the person or organisation to whom it is addressed. It may contain
privileged and confidential information and if you are not the intended
recipient, you must not copy, distribute or take any action in reliance
on it. If you have received this email in error, please reply to the
sender as soon as possible and delete the message. Please note that we
are able to, and reserve the right to, monitor e-mail communications
passing through our network.
The views expressed in this email are not that of the company unless
specified within the message.
The inclusion of this footnote indicates that the mail message and any
attachments have been checked for the presence of known viruses.
If you have any comments regarding our policy please direct them to
postmaster@cox.co.uk
________________________________________________________________________
This email has been scanned for all viruses by the MessageLabs Email
Security System. For more information on a proactive email security
service working around the clock, around the globe, visit
http://www.messagelabs.com
________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jan 25 16:45:18 2005

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