[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: SVN Merge issue

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-12-31 14:08:46 CET

On Dec 30, 2007 8:14 AM, Aviva Levin <AvivaL@radware.com> wrote:
> Let suppose that we are developing version 1.0 of some product and have an
> integration branch for this version on trunk.
>
> Developer David starts the implementation of feature A for version 1.0
>
> David creates his personal branch (copies from trunk) and makes his changes.
> Let say he copies revision 25.
>
> Then he commits his changes on his branch and merges them to trunk, and
> commits the merge. Let say David creates revision 70.
>
>
> Now I am looking on the trunk branch and want to know how revision 70 was
> created (whether it was the result of merge or not, from what branches it
> was merged etc.) How do I know that?

Subversion prior to version 1.5 does not track this sort of
information. Subversion 1.5 introduces a merge-tracking feature which
will provide this information. In the meantime, one can use
svnmerge.py to perform merges, which will make note of how the merge
was performed. Information from both svnmerge.py and the
merge-tracking in 1.5 is available from the repository log, accessed
with svn log.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 31 14:09:04 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.