[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: matthew ford <matthew.ford_at_forward.com.au>
Date: 2005-01-25 23:34:33 CET

----- Original Message -----
From: "Lübbe Onken" <l.onken@rac.de>
To: <dev@tortoisesvn.tigris.org>
Sent: Wednesday, January 26, 2005 2:18 AM
Subject: RE: [TSVN] Re: Merge dialog, second attempt

>
> 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.
>
Well the current program might want you to do that, but I would just like to
merge the changes from r38 to r50 inclusive since I know r36 has been copied
to the branch already.
matthew

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jan 25 23:35:22 2005

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