[Home]

Summary:ASTERISK-03129: [patch] Summarize conflicts at end of 'make update'
Reporter:Tilghman Lesher (tilghman)Labels:
Date Opened:2004-12-29 12:51:18.000-0600Date Closed:2008-01-15 15:18:53.000-0600
Priority:MajorRegression?No
Status:Closed/CompleteComponents:Core/Configuration
Versions:Frequency of
Occurrence
Related
Issues:
Environment:Attachments:( 0) 20041229__summarize_conflicts.diff.txt
Description:Makefile patch that detects all the conflict files during an update and prints them together at the bottom of the update output.

****** ADDITIONAL INFORMATION ******

Disclaimer on file.
Comments:By: Olle Johansson (oej) 2004-12-29 13:37:27.000-0600

Good patch.

By: Mark Spencer (markster) 2004-12-29 19:02:35.000-0600

Added to CVS, thanks.

By: Russell Bryant (russell) 2005-01-02 10:18:47.000-0600

not in 1.0

By: Digium Subversion (svnbot) 2008-01-15 15:18:53.000-0600

Repository: asterisk
Revision: 4599

U   trunk/Makefile

------------------------------------------------------------------------
r4599 | markster | 2008-01-15 15:18:52 -0600 (Tue, 15 Jan 2008) | 2 lines

Show conflits on make update (bug ASTERISK-3129)

------------------------------------------------------------------------

http://svn.digium.com/view/asterisk?view=rev&revision=4599