Andy;
Thank you for your answer.
Does it means that in current version the only way to perform controlled
merge is using (with svnmerge.py) and not GUI?
Thanks again,
Aviva
-----Original Message-----
From: Andy Levy [mailto:andy.levy@gmail.com]
Sent: Monday, December 31, 2007 3:09 PM
To: Aviva Levin
Cc: users@subversion.tigris.org
Subject: Re: SVN Merge issue
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:21:13 2007