I mean do I use N or N -1?
> -----Original Message-----
> From: Brad Rhoads [mailto:brhoads@zethcon.com]
> Sent: Friday, August 13, 2004 10:14 AM
> To: dev@tortoisesvn.tigris.org
> Subject: RE: [TSVN] Merge Questions
>
> Yep, it works!
>
> One more question. . .
>
> If after I merge and commit trunk, creating rev N, what From
> Rev do I use next time I merge, N or N + 1?
>
> For example,
>
> Rev 11 is the HEAD of mybranch
> Merge and commit trunk, creating Rev 12
> Do other stuff in mybranch
>
> If I want to merge again, should my From Rev be 11 or 12?
>
>
> Thanks for the help.
>
> > -----Original Message-----
> > From: SteveKing [mailto:steveking@gmx.ch]
> > Sent: Friday, August 13, 2004 2:52 AM
> > To: dev@tortoisesvn.tigris.org
> > Subject: Re: [TSVN] Merge Questions
> >
> > Brad Rhoads wrote:
> >
> > > Nope, I did the TSVN Merge. Used /MyBranch in both From &
> > To. From Rev
> > > was 1 < the rev that created the branch (this was wrong)
> and To Rev
> > > was the last
> >
> > The "from" rev can't be 1 smaller than when you created the branch,
> > because in that revision the branch didn't exist yet.
> >
> > > rev in the branch (same as HEAD, right?).
> >
> > Yes. You can also just write "HEAD" (without the quotes) in the
> > revision field.
> >
> > > I'll try and do it right and see what happens.
> >
> > Please report back if it works (or if it doesn't).
> >
> > Stefan
> >
> >
> >
> ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
> > For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
> >
> >
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Aug 13 18:29:18 2004