Ticket #242 (closed defect: fixed)

Opened 2 years ago

Last modified 1 year ago

Diff is missing

Reported by: austriancoder Assigned to: somebody
Priority: critical Milestone:
Component: packages Version: trunk
Keywords: diff Cc:

Description (Last modified by tg)

root@FreeWRT:~# ipkg upgrade Upgrading mtd on root from 1.0-6 to 1.0-7... Downloading http://192.168.1.131/packages/mtd_1.0-7_mipsel.ipk Upgrading shorewall on root from 3.2.8-2 to 3.2.9-1... Downloading http://192.168.1.131/packages/shorewall_3.2.9-1_mipsel.ipk

Configuration file '/etc/shorewall/interfaces' ==> File on system created by you or by a script. ==> File also in package provided by package maintainer.

What would you like to do about it ? Your options are:

Y or I : install the package maintainer's version N or O : keep your currently-installed version

D : show the differences between the versions (if diff is installed)

The default action is to keep your current version.

*** interfaces (Y/I/N/O/D) [default=N] ?D

sh: diff: not found

[Press ENTER to continue]

Attachments

Change History

03/04/07 14:04:34 changed by ulmen

This was fixed in 1.0 with Changeset [1346], but it seems not to have made it into trunk... don't ask me why.

But 18 Days before this particular commit, i wrote an email (https://www.freewrt.org/list-archives/freewrt-users/2006-December/000091.html), in which i denounced the ongoing direct commits to the 1.0 branch. Nothing changed since then.

Please everyone stand up and shout "REGRESSION"!

03/13/07 21:30:17 changed by tg

  • status changed from new to closed.
  • resolution set to fixed.
  • description changed.

That's what you get when you do not commit to trunk before or, at most, at the same time (i.e. in the same changeset!) as the commit you do to the stable branch.

Please don't commit to freewrt_1_0 branch any more without wbx@ signing off the diff beforehand!

06/30/07 17:40:34 changed by anonymous

06/30/07 17:41:22 changed by anonymous

06/30/07 17:41:37 changed by anonymous


Add/Change #242 (Diff is missing)




Action