[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#7907: 24.0.50; trunk build failure

From: Jason Rumney
Subject: bug#7907: 24.0.50; trunk build failure
Date: Mon, 31 Jan 2011 08:59:55 +0800
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv: Gecko/20100111 Thunderbird/3.0.1

On 29/01/2011 23:56, Stefan Monnier wrote:
Symbol's value as variable is void:<<<<<<<
You have conflict markers in the file.  While they may have been
committed to the trunk, it's at least as likely that they are only in
your checkout tree because of other changes you've performed that
collide with recent changes.

The same happened to me recently with dired.el. The conflict was caused by the hash value at the end of the generated autoloads block (everything else was the same). Has something changed recently that affects the generation of that hash?

Should the build process be changing files like dired.el, that are not dedicated autoload files? It is very confusing to users to get a conflict in a file they have not changed which is not obviously an autogenerated file.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]