RE: Blame information lost in merge
Is this in 1.50? I know that Subversion 1.50 keeps the mergeinfo, but
I'm wondering how possible it is to display blame info nicely if your
merge contains subsequent edits to resolve conflicts or whatnot.
> -----Original Message-----
> From: Philippe Andersson [mailto:pan_at_iba-group.com]
> Sent: Thursday, July 10, 2008 3:06 AM
> To: users_at_subversion.tigris.org
> Subject: Blame information lost in merge
> Hello again, list,
> Here is the scenario:
> - 'file' is modified by John in branch B
> - blame in branch B correctly identifies his contributions
> - branch B is merged in trunk by Sally
> - blame in trunk sees all of 'file' as being contributed by Sally
> Is this the expected behaviour ? If so, is it possible to ask "merge"
> keep the original contribution info ?
> Cheers. Bye.
> Ph. A.
> *Philippe Andersson*
> Unix System Administrator
> IBA Particle Therapy |
> Tel: +32-10-475.983
> Fax: +32-10-487.707
> eMail: pan_at_iba-group.com
> The contents of this e-mail message and any attachments are intended
> solely for
> the recipient (s) named above. This communication is intended to be
> remain confidential and may be protected by intellectual property
> use of the information contained herein (including but not limited to,
> total or
> partial reproduction, communication or distribution of any form) by
> other than the designated recipient(s) is prohibited. Please notify
> immediately by e-mail if you have received this e-mail by mistake and
> this e-mail from your system. E-mail transmission cannot be guaranteed
> secure or error-free. Ion Beam Applications does not accept liability
> such errors. Thank you for your cooperation.
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-10 15:13:12 CEST
This is an archived mail posted to the Subversion Users