RE: [Subclipse-users] sequential merging

Thanks Mark for the quick response.

-----Original Message-----
From: Mark Phippard [mailto:markp@softlanding.com]
Sent: Wednesday, October 04, 2006 2:57 PM
To: users@subclipse.tigris.org
Cc: D'Souza, Stalin [SB]
Subject: Re: [Subclipse-users] sequential merging

"D'Souza, Stalin [SB]" <stalin.dsouza@citigroup.com> wrote on 10/04/2006

02:47:35 PM:

> I have branch A copied from trunk.
> I have branch B copied from branch A (after A has advanced several
revisions).
>
> Now A and B are two lines of development, but I periodically merge
changes
> from A to B to keep B up to date (for the eventual merge of B back to
> A
and
> the retirement of B).
>
> So I merge sequentially from the last merge to latest. i avoid using
HEAD to
> keep track of the merge revisions..
>
> merge svn -r 100:140 ...
>
> <few days/weeks pass>
>
> merge svn -r 141:180 ...
>
> <few days/weeks pass>
>
> merge svn -r 181:200 ...
>
> Is it correct to increment the numbers as in the example, or should i
> repeated the 'boundary' revisions.

No you are losing revision 141 amd 181 when you do this. You need to
repeat the boundary revisions.

If you use the Select Revision dialog and choose the revision range that

contains the revisions whose changes you want to merge, it will enter
the
correct values in the dialog.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Wed Oct 4 20:59:54 2006