Shelve removing file "uninstall.exe"? [yNfq?]
--- watchdog.pid 2009-01-28 11:59:31 +0000
+++ watchdog.pid 2009-02-02 10:54:27 +0000
@@ -1 +1 @@
-5048
\ No newline at end of file
+3032
\ No newline at end of file
[end snip]
Watchdog.pid is a one line file with no newline. bzr seems to want more.
It should never have been version controlled in the first place, but there you go. Sometimes it happens.
Here's the end of the error. Also malformed tree.
Selected changes:
M .bzrignore
N CHANGELOG
N COPYING
N Cfg.ini
N Help.chm
N Nmap/3.01alpha-WinPcap.exe
N Nmap/WinPcap_3_0.exe
N Nmap/nmap-3.75/
N Nmap/nmap-3.75/CHANGELOG
N Nmap/nmap-3.75/COPYING
N Nmap/nmap-3.75/README-WIN32
N Nmap/nmap-3.75/nmap-mac-prefixes
N Nmap/nmap-3.75/nmap-os-fingerprints
N Nmap/nmap-3.75/nmap-protocols
N Nmap/nmap-3.75/nmap-rpc
N Nmap/nmap-3.75/nmap-service-probes
N Nmap/nmap-3.75/nmap-services
N Nmap/nmap-3.75/nmap_performance.reg
N Nmap/nselib-bin/
N Nmap/nselib-bin/bit.dll
N Nmap/scripts/SNMPsysdesr.nse
N Nmap/scripts/kibuvDetection.nse
N Nmap/scripts/mswindowsShell.nse
N Nmap/winpcap-nmap-4.02.exe
N Nmap/zenmap/_psyco.pyd
N Nmap/zenmap/share/icons/
N Nmap/zenmap/share/icons/nmap-eye.ico
N Nmap/zenmap/share/icons/umit_128.ico
N Nmap/zenmap/share/icons/umit_16.ico
N Nmap/zenmap/share/icons/umit_24.ico
N Nmap/zenmap/share/icons/umit_32.ico
N Nmap/zenmap/share/icons/umit_48.ico
N Nmap/zenmap/share/pixmaps/
N Nmap/zenmap/share/pixmaps/default.svg
N Nmap/zenmap/share/pixmaps/default_32.png
N Nmap/zenmap/share/pixmaps/default_75.png
N Nmap/zenmap/share/pixmaps/freebsd.svg
N Nmap/zenmap/share/pixmaps/freebsd_32.png
N Nmap/zenmap/share/pixmaps/freebsd_75.png
N Nmap/zenmap/share/pixmaps/irix.svg
N Nmap/zenmap/share/pixmaps/irix_32.png
N Nmap/zenmap/share/pixmaps/irix_75.png
N Nmap/zenmap/share/pixmaps/linux.svg
N Nmap/zenmap/share/pixmaps/linux_32.png
N Nmap/zenmap/share/pixmaps/linux_75.png
N Nmap/zenmap/share/pixmaps/logo.png
N Nmap/zenmap/share/pixmaps/macosx.svg
N Nmap/zenmap/share/pixmaps/macosx_32.png
N Nmap/zenmap/share/pixmaps/macosx_75.png
N Nmap/zenmap/share/pixmaps/openbsd.svg
N Nmap/zenmap/share/pixmaps/openbsd_32.png
N Nmap/zenmap/share/pixmaps/openbsd_75.png
N Nmap/zenmap/share/pixmaps/redhat.svg
N Nmap/zenmap/share/pixmaps/redhat_32.png
N Nmap/zenmap/share/pixmaps/redhat_75.png
N Nmap/zenmap/share/pixmaps/shadow_man.svg
N Nmap/zenmap/share/pixmaps/shadow_man_32.png
N Nmap/zenmap/share/pixmaps/shadow_man_75.png
N Nmap/zenmap/share/pixmaps/solaris.svg
N Nmap/zenmap/share/pixmaps/solaris_32.png
N Nmap/zenmap/share/pixmaps/solaris_75.png
N Nmap/zenmap/share/pixmaps/splash.png
N Nmap/zenmap/share/pixmaps/ubuntu.svg
N Nmap/zenmap/share/pixmaps/ubuntu_32.png
N Nmap/zenmap/share/pixmaps/ubuntu_75.png
N Nmap/zenmap/share/pixmaps/unknown.svg
N Nmap/zenmap/share/pixmaps/unknown_32.png
N Nmap/zenmap/share/pixmaps/unknown_75.png
N Nmap/zenmap/share/pixmaps/vl_1.svg
N Nmap/zenmap/share/pixmaps/vl_1_32.png
N Nmap/zenmap/share/pixmaps/vl_1_75.png
N Nmap/zenmap/share/pixmaps/vl_2.svg
N Nmap/zenmap/share/pixmaps/vl_2_32.png
N Nmap/zenmap/share/pixmaps/vl_2_75.png
N Nmap/zenmap/share/pixmaps/vl_3.svg
N Nmap/zenmap/share/pixmaps/vl_3_32.png
N Nmap/zenmap/share/pixmaps/vl_3_75.png
N Nmap/zenmap/share/pixmaps/vl_4.svg
N Nmap/zenmap/share/pixmaps/vl_4_32.png
N Nmap/zenmap/share/pixmaps/vl_4_75.png
N Nmap/zenmap/share/pixmaps/vl_5.svg
N Nmap/zenmap/share/pixmaps/vl_5_32.png
N Nmap/zenmap/share/pixmaps/vl_5_75.png
N Nmap/zenmap/share/pixmaps/win.svg
N Nmap/zenmap/share/pixmaps/win_32.png
N Nmap/zenmap/share/pixmaps/win_75.png
N Nmap/zenmap/share/pixmaps/wizard_logo.png
N Nmap/zenmap/share/zenmap/misc/os_db.dmp
N Nmap/zenmap/share/zenmap/misc/services.dmp
N Pomoc.chm
N TROUTE.EXE
N UNTGZ32.EXE
N WZUNZIP.EXE
N cdave.pem
N cmdpack/
N cmdpack/BATCHRUN.EXE
N cmdpack/CAL.EXE
N cmdpack/CLOSECD.EXE
N cmdpack/DF.EXE
N cmdpack/DU.EXE
N cmdpack/FILEFIND.EXE
N cmdpack/GREP.EXE
N cmdpack/HEAD.EXE
N cmdpack/HEXDUMP.EXE
N cmdpack/HOST.EXE
N cmdpack/ITIME.EXE
N cmdpack/OPENCD.EXE
N cmdpack/OPENWEB.EXE
N cmdpack/RNET.EXE
N cmdpack/SHUTDOWN.EXE
N cmdpack/TAIL.EXE
N cmdpack/TREE.EXE
N cmdpack/TROUTE.EXE
N cmdpack/UPTIME.EXE
N cmdpack/WC.EXE
N cmdpack/WHOAMI.EXE
N cmdpack/WHOIS.EXE
N cmdpack/cmpregister.exe
N cmdpack/fileversion.exe
N cmdpack/finger.exe
N cmdpack/mycpu.exe
N cygcrypto.dll
N cygpopt-0.dll
N cygregex.dll
N cygwin1.dll
N cygz.dll
N do_snmp.bat
N equ.html
N equ.txt
N export_20080417-154420.csv
N export_20080417-154521.csv
N fw.zip
N gnokii.dll
N gnokii.exe
N ipns.csv
N ipns_subnets.csv
N nmap-mac-prefixes
N nmap-os-db
N nmap-os-fingerprints
N nmap-protocols
N nmap-rpc
N nmap-service-probes
N nmap-services
N nmap.exe
N nmap.xsl
N nmap_performance.reg
N openssl.exe
N out.txt
N putty.exe
N puttytel.exe
N racs_users.csv
N snmp/TrapReceiver/
N snmp/TrapReceiver/Mibdb.db
N snmp/TrapReceiver/TrapRcvr.exe
N snmp/TrapReceiver/trThread.exe
M snmp/bin/mib2c.bat
M snmp/bin/snmpconf.bat
M snmp/bin/traptoemail.bat
M snmp/etc/snmp/snmp.conf
M snmp/etc/snmp/snmp.conf.new
M snmp/registeragent.bat
M snmp/registertrapd.bat
N snmp/share/snmp/mibs/.index
N snmp/snmp/persist/snmptrapd.conf
M snmp/snmptt/snmptt.ini-nt
M snmp/snmptt_gui/Thumbs.db
N snmp/snmptt_gui/scripts/images/Thumbs.db
M snmp/unregisteragent.bat
M snmp/unregistertrapd.bat
N ssh.exe
N subnetlist.txt
N t.bat
N uninstall.exe
M watchdog.pid
N winpcap-nmap-3.1.B.exe
N x.sql
N x.txt
bzr: ERROR: Tree transform is malformed [('duplicate', 'new-6', 'new-931', u'nmap')]
bzr shelve also creates errors I'm afraid.
for example no newline at end of file.
[snip]
Shelve removing file "uninstall.exe"? [yNfq?]
--- watchdog.pid 2009-01-28 11:59:31 +0000
+++ watchdog.pid 2009-02-02 10:54:27 +0000
@@ -1 +1 @@
-5048
\ No newline at end of file
+3032
\ No newline at end of file
[end snip]
Watchdog.pid is a one line file with no newline. bzr seems to want more.
It should never have been version controlled in the first place, but there you go. Sometimes it happens.
Here's the end of the error. Also malformed tree.
Selected changes: 01alpha- WinPcap. exe 3_0.exe 3.75/CHANGELOG 3.75/COPYING 3.75/README- WIN32 3.75/nmap- mac-prefixes 3.75/nmap- os-fingerprints 3.75/nmap- protocols 3.75/nmap- rpc 3.75/nmap- service- probes 3.75/nmap- services 3.75/nmap_ performance. reg bin/bit. dll SNMPsysdesr. nse kibuvDetection. nse mswindowsShell. nse nmap-4. 02.exe _psyco. pyd share/icons/ share/icons/ nmap-eye. ico share/icons/ umit_128. ico share/icons/ umit_16. ico share/icons/ umit_24. ico share/icons/ umit_32. ico share/icons/ umit_48. ico share/pixmaps/ share/pixmaps/ default. svg share/pixmaps/ default_ 32.png share/pixmaps/ default_ 75.png share/pixmaps/ freebsd. svg share/pixmaps/ freebsd_ 32.png share/pixmaps/ freebsd_ 75.png share/pixmaps/ irix.svg share/pixmaps/ irix_32. png share/pixmaps/ irix_75. png share/pixmaps/ linux.svg share/pixmaps/ linux_32. png share/pixmaps/ linux_75. png share/pixmaps/ logo.png share/pixmaps/ macosx. svg share/pixmaps/ macosx_ 32.png share/pixmaps/ macosx_ 75.png share/pixmaps/ openbsd. svg share/pixmaps/ openbsd_ 32.png share/pixmaps/ openbsd_ 75.png share/pixmaps/ redhat. svg share/pixmaps/ redhat_ 32.png share/pixmaps/ redhat_ 75.png share/pixmaps/ shadow_ man.svg share/pixmaps/ shadow_ man_32. png share/pixmaps/ shadow_ man_75. png share/pixmaps/ solaris. svg share/pixmaps/ solaris_ 32.png share/pixmaps/ solaris_ 75.png share/pixmaps/ splash. png share/pixmaps/ ubuntu. svg share/pixmaps/ ubuntu_ 32.png share/pixmaps/ ubuntu_ 75.png share/pixmaps/ unknown. svg share/pixmaps/ unknown_ 32.png share/pixmaps/ unknown_ 75.png share/pixmaps/ vl_1.svg share/pixmaps/ vl_1_32. png share/pixmaps/ vl_1_75. png share/pixmaps/ vl_2.svg share/pixmaps/ vl_2_32. png share/pixmaps/ vl_2_75. png share/pixmaps/ vl_3.svg share/pixmaps/ vl_3_32. png share/pixmaps/ vl_3_75. png share/pixmaps/ vl_4.svg share/pixmaps/ vl_4_32. png share/pixmaps/ vl_4_75. png share/pixmaps/ vl_5.svg share/pixmaps/ vl_5_32. png share/pixmaps/ vl_5_75. png share/pixmaps/ win.svg share/pixmaps/ win_32. png share/pixmaps/ win_75. png share/pixmaps/ wizard_ logo.png share/zenmap/ misc/os_ db.dmp share/zenmap/ misc/services. dmp BATCHRUN. EXE FILEFIND. EXE SHUTDOWN. EXE cmpregister. exe fileversion. exe 20080417- 154420. csv 20080417- 154521. csv fingerprints e.reg er/Mibdb. db er/TrapRcvr. exe er/trThread. exe snmpconf. bat traptoemail. bat snmp/snmp. conf snmp/snmp. conf.new ent.bat apd.bat snmp/mibs/ .index persist/ snmptrapd. conf snmptt. ini-nt gui/Thumbs. db gui/scripts/ images/ Thumbs. db agent.bat trapd.bat nmap-3. 1.B.exe
M .bzrignore
N CHANGELOG
N COPYING
N Cfg.ini
N Help.chm
N Nmap/3.
N Nmap/WinPcap_
N Nmap/nmap-3.75/
N Nmap/nmap-
N Nmap/nmap-
N Nmap/nmap-
N Nmap/nmap-
N Nmap/nmap-
N Nmap/nmap-
N Nmap/nmap-
N Nmap/nmap-
N Nmap/nmap-
N Nmap/nmap-
N Nmap/nselib-bin/
N Nmap/nselib-
N Nmap/scripts/
N Nmap/scripts/
N Nmap/scripts/
N Nmap/winpcap-
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Nmap/zenmap/
N Pomoc.chm
N TROUTE.EXE
N UNTGZ32.EXE
N WZUNZIP.EXE
N cdave.pem
N cmdpack/
N cmdpack/
N cmdpack/CAL.EXE
N cmdpack/CLOSECD.EXE
N cmdpack/DF.EXE
N cmdpack/DU.EXE
N cmdpack/
N cmdpack/GREP.EXE
N cmdpack/HEAD.EXE
N cmdpack/HEXDUMP.EXE
N cmdpack/HOST.EXE
N cmdpack/ITIME.EXE
N cmdpack/OPENCD.EXE
N cmdpack/OPENWEB.EXE
N cmdpack/RNET.EXE
N cmdpack/
N cmdpack/TAIL.EXE
N cmdpack/TREE.EXE
N cmdpack/TROUTE.EXE
N cmdpack/UPTIME.EXE
N cmdpack/WC.EXE
N cmdpack/WHOAMI.EXE
N cmdpack/WHOIS.EXE
N cmdpack/
N cmdpack/
N cmdpack/finger.exe
N cmdpack/mycpu.exe
N cygcrypto.dll
N cygpopt-0.dll
N cygregex.dll
N cygwin1.dll
N cygz.dll
N do_snmp.bat
N equ.html
N equ.txt
N export_
N export_
N fw.zip
N gnokii.dll
N gnokii.exe
N ipns.csv
N ipns_subnets.csv
N nmap-mac-prefixes
N nmap-os-db
N nmap-os-
N nmap-protocols
N nmap-rpc
N nmap-service-probes
N nmap-services
N nmap.exe
N nmap.xsl
N nmap_performanc
N openssl.exe
N out.txt
N putty.exe
N puttytel.exe
N racs_users.csv
N snmp/TrapReceiver/
N snmp/TrapReceiv
N snmp/TrapReceiv
N snmp/TrapReceiv
M snmp/bin/mib2c.bat
M snmp/bin/
M snmp/bin/
M snmp/etc/
M snmp/etc/
M snmp/registerag
M snmp/registertr
N snmp/share/
N snmp/snmp/
M snmp/snmptt/
M snmp/snmptt_
N snmp/snmptt_
M snmp/unregister
M snmp/unregister
N ssh.exe
N subnetlist.txt
N t.bat
N uninstall.exe
M watchdog.pid
N winpcap-
N x.sql
N x.txt
bzr: ERROR: Tree transform is malformed [('duplicate', 'new-6', 'new-931', u'nmap')]