New submission from Ben Godfrey <[EMAIL PROTECTED]>:
darcs: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
merger 0.0 (
merger 0.0 (
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 83
-
)
)
hunk ./settings.py 83
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
)
)
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 83
-
)
)
hunk ./settings.py 83
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
)
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
)
merger 0.0 (
merger 0.0 (
hunk ./settings.py 83
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
merger 0.0 (
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 83
-
)
)
)
hunk ./settings.py 90
-DUMP_REQUEST = True
+DUMP_REQUEST = False
)
)
)
merger 0.0 (
merger 0.0 (
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
merger 0.0 (
merger 0.0 (
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 83
-
)
)
hunk ./settings.py 83
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
)
)
)
hunk ./settings.py 83
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 83
-
)
)
hunk ./settings.py 83
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
)
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
)
merger 0.0 (
merger 0.0 (
hunk ./settings.py 83
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
merger 0.0 (
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 83
-
)
)
)
hunk ./settings.py 90
-DUMP_REQUEST = True
+DUMP_REQUEST = False
)
)
merger 0.0 (
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
merger 0.0 (
merger 0.0 (
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 83
-
)
)
hunk ./settings.py 83
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
)
)
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./settings.py 83
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
merger 0.0 (
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 83
-
)
)
)
hunk ./settings.py 90
-DUMP_REQUEST = True
+DUMP_REQUEST = False
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 83
-
)
)
hunk ./settings.py 83
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
)
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
)
)
merger 0.0 (
merger 0.0 (
hunk ./settings.py 90
-DUMP_REQUEST = True
+DUMP_REQUEST = False
merger 0.0 (
hunk ./settings.py 83
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
merger 0.0 (
hunk ./settings.py 85
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 82
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 83
-
)
)
)
)
hunk ./settings.py 82
+# Timeouts affect conversations with Luup, MetaCharge, MIG, eBay and
+# merchant image hosts
+setdefaulttimeout(10.0)
+
)
)
)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./settings.py 83
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 80
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
merger 0.0 (
merger 0.0 (
hunk ./settings.py 83
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 80
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 81
-
)
)
hunk ./settings.py 81
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
)
)
)
hunk ./settings.py 81
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./settings.py 80
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
merger 0.0 (
merger 0.0 (
hunk ./settings.py 83
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 80
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 81
-
)
)
hunk ./settings.py 81
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
)
)
hunk ./settings.py 83
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
)
merger 0.0 (
merger 0.0 (
merger 0.0 (
merger 0.0 (
hunk ./settings.py 83
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 80
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 81
-
)
)
hunk ./settings.py 81
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
)
hunk ./settings.py 80
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
)
merger 0.0 (
merger 0.0 (
hunk ./settings.py 81
-openlog("mymart", 0, LOG_LOCAL1)
+openlog("mymart", 0, LOG_USER)
merger 0.0 (
hunk ./settings.py 83
+# Request/response debug logging
+logging.basicConfig(filename="/var/log/dumpio.log", filemode="a",
+ format="%(asctime)s %(levelname)s %(name)s %(message)s",
+ level=logging.DEBUG)
+DUMP_LOG = logging.getLogger("dumpio")
merger 0.0 (
hunk ./settings.py 80
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
hunk ./settings.py 81
-
)
)
)
hunk ./settings.py 88
-DUMP_REQUEST = True
+DUMP_REQUEST = False
)
)
)
)
hunk ./settings.py 80
-# Debug logging
+# Syslog
+openlog("mymart", 0, LOG_LOCAL1)
)
)
Please report this to [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
darcs --exact-version output:
darcs compiled on Jul 18 2006, at 15:08:59
# configured Tue Jul 18 15:03:25 JST 2006
./configure --with-static-libs
Context:
[TAG 1.0.8
Tommy Pettersson <[EMAIL PROTECTED]>**20060616160213]
----------
messages: 2067
nosy: ben, beschmi, droundy, kowey, tommy
status: unread
title: Bug pulling to repository
__________________________________
Darcs bug tracker <[EMAIL PROTECTED]>
<http://bugs.darcs.net/issue519>
__________________________________
_______________________________________________
darcs-devel mailing list
[email protected]
http://lists.osuosl.org/mailman/listinfo/darcs-devel
