Should my WC be from the trunk (HEAD) or branch (HEAD) then?
On 3/27/07, Norbert Unterberg <nunterberg@gmail.com> wrote:
>
> 2007/3/22, Cheng Wei Lee <zhenwei.li@gmail.com>:
> > I'd a trunk for on-going development work & branch for production bug
> > fixing. After I release the branch into production, I tried to merge it
> back
> > to the trunk (there're on-going work in the trunk). I found that a newly
> > created file in the trunk was deleted.
>
> > My steps are:
> >
> > 1. Check out a WC of my trunk (HEAD revision).
> > 2. Right-click on WC folder, TortoiseSVN > Merge
> > 3. From URL: trunk URL (HEAD revision), To URL: branch URL (HEAD
> revision)
> > 4. Merge
>
> This is wrong. You merged the changes beween the branch-head and the
> trunk-head into trunk. The result is a trung that is identical to the
> branch. All changes in the trunk since the branch point will be gone.
>
> What you really want is:
> 3. From URL: branch (HEAD), To URL: branch at revision where branch was
> created
> 4. Merge.
>
> If you look closely, the Merge dialog has three sections: From - To -
> Result
> It merges the difference between FROM and TO into RESULT.
>
> Norbert
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
> For additional commands, e-mail: users-help@tortoisesvn.tigris.org
>
>
Received on Tue Mar 27 03:48:41 2007