Re: Merging and branch deletion question

On Oct 11, 2007, at 13:12, John Gateley wrote:

> A newbie question on merging and deleting branches.
> For example, suppose there is a file foo.c in my repository
>
> foo.c was last changed in revision 3.
>
> I created a branch for a new feature, and made changes to foo.c
> in revisions 4 through 20. I made no changes to foo.c in the main
> line.
>
> I then merged the new feature branch changes (r4:20) into the
> main branch (and committed).
>
> I deleted the new feature branch.
>
> It seems to me the history of foo.c from r4:20 is gone.

The history is still there... just use

svn log url://to/your/repo/branches/thebranchyoudeleted_at_4

where "4" is any revision where the branch still existed.

> The log for foo.c on the main branch doesn't contain those
> changes.

That's correct. The log for the main branch should show only a single
revision for this -- the one in which you merged the changes from the
feature branch. Hopefully, in that commit message, you stated that
you merged in revisions 4 thru 20 from the feature branch, so anyone
who wants to look up more details will know where to look.

> If I had merged the changes as suggested in the book (merge
> any changes from 4 to 20 that happened in the main branch to
> the new feature branch, then merge the diff between the new
> feature head and the main head into main), would it make any
> difference?

No.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Oct 11 23:03:33 2007