This fixed the problem: $ QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null pop -a -R -f Removing patch deb-webjumps.diff Removing modules/debian/webjumps.js Restoring defaults/preferences/default-modules.js
Removing patch sensible-editor.diff Restoring modules/external-editor.js No patches applied $ git reset Unstaged changes after reset: M defaults/preferences/default-modules.js $ git stash Saved working directory and index state WIP on master: 0b33e30 move source-code-related stuff out of utils.js, into source-code.js HEAD is now at 0b33e30 move source-code-related stuff out of utils.js, into source-code.js $git pull On Sat, 2010-02-06 at 16:08 -0500, fred concklin wrote: > anybody have any ideas on how do fix this? > > f...@daffy ~/src/conkeror/conkeror $ git pull > remote: Counting objects: 73, done. > remote: Compressing objects: 100% (49/49), done. > remote: Total 58 (delta 42), reused 13 (delta 7) > Unpacking objects: 100% (58/58), done. > From git://repo.or.cz/conkeror > abef2ed..aea2f28 master -> origin/master > Updating 39fff2f..aea2f28 > error: Your local changes to 'defaults/preferences/default-modules.js' > would be overwritten by merge. Aborting. > Please, commit your changes or stash them before you can merge. > f...@daffy ~/src/conkeror/conkeror $ git stash > Saved working directory and index state WIP on master: 39fff2f man > page: Make a difference between Conkeror and conkeror > HEAD is now at 39fff2f man page: Make a difference between Conkeror and > conkeror > f...@daffy ~/src/conkeror/conkeror $ git pull > Updating 39fff2f..aea2f28 > Fast-forward > CREDITS | 2 + > components/commandline.js | 2 + > debian/NEWS.Debian | 4 +- > debian/changelog | 28 ++++++++++- > debian/conkeror.bin | 2 +- > debian/conkeror.bug-script | 9 ++++ > debian/conkeror.lintian-overrides | 4 ++ > debian/control | 10 ++-- > debian/patches/deb-webjumps.diff | 17 ++++--- > debian/rules | 2 + > defaults/preferences/default-modules.js | 1 + > modules/bindings/default/content-buffer/element.js | 2 + > modules/bindings/default/global.js | 8 +++ > modules/element.js | 11 ++++ > modules/help.js | 40 ++++++++++++++-- > modules/input.js | 24 ++++++++-- > modules/load-spec.js | 30 ++++++++++-- > modules/page-modes/stackoverflow.js | 49 > ++++++++++++++++++++ > modules/search-engine.js | 1 + > search-engines/wiktionary.xml | 15 ++++++ > 20 files changed, 228 insertions(+), 33 deletions(-) > create mode 100644 debian/conkeror.bug-script > create mode 100644 debian/conkeror.lintian-overrides > create mode 100644 modules/page-modes/stackoverflow.js > create mode 100644 search-engines/wiktionary.xml > f...@daffy ~/src/conkeror/conkeror $ dpkg-buildpackage -rfakeroot > dpkg-buildpackage: set CFLAGS to default value: -g -O2 > dpkg-buildpackage: set CPPFLAGS to default value: > dpkg-buildpackage: set LDFLAGS to default value: > dpkg-buildpackage: set FFLAGS to default value: -g -O2 > dpkg-buildpackage: set CXXFLAGS to default value: -g -O2 > dpkg-buildpackage: source package conkeror > dpkg-buildpackage: source version 0.9.1+git100204-1 > dpkg-buildpackage: source changed by Axel Beckert <[email protected]> > dpkg-buildpackage: host architecture i386 > fakeroot debian/rules clean > QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null pop -a -R || test $? = > 2 > Patch deb-webjumps.diff does not remove cleanly (refresh it or enforce with > -f) > make: *** [unpatch] Error 1 > dpkg-buildpackage: error: fakeroot debian/rules clean gave error exit status 2
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Conkeror mailing list [email protected] https://www.mozdev.org/mailman/listinfo/conkeror
