darcs

Issue 519 pull => bug in function reconcile_unwindings (1.0.8)

Title pull => bug in function reconcile_unwindings (1.0.8)
Priority bug Status duplicate
Milestone Resolved in
Superseder pull => bug in function reconcile_unwindings (** minimal test case **)
View: 194
Nosy List ben, darcs-devel, dmitry.kurochkin, kowey, thorkilnaur, tommy
Assigned To
Topics

Created on 2007-08-14.17:10:37 by ben, last changed 2009-08-27.13:51:37 by admin.

Messages
msg2067 (view) Author: ben Date: 2007-08-14.17:10:37
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 bugs@darcs.net
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 <ptp@lysator.liu.se>**20060616160213]
msg2068 (view) Author: kowey Date: 2007-08-14.17:21:48
Alas, this is a known and longstanding issue (see issue194), but there is work
underway to replace our handling of conflicts with something which will be less
prone to this kind of error.  Moving you to that bug and closing.
History
Date User Action Args
2007-08-14 17:10:38bencreate
2007-08-14 17:21:50koweysetstatus: unread -> duplicate
superseder: + pull => bug in function reconcile_unwindings (** minimal test case **)
messages: + msg2068
title: Bug pulling to repository -> pull => bug in function reconcile_unwindings (1.0.8)
2009-08-06 17:32:51adminsetnosy: + markstos, jast, Serware, dmitry.kurochkin, darcs-devel, zooko, dagit, mornfall, simon, thorkilnaur, - droundy, ben
2009-08-06 20:30:16adminsetnosy: - beschmi
2009-08-10 22:07:29adminsetnosy: + ben, - markstos, darcs-devel, zooko, jast, dagit, Serware, mornfall
2009-08-25 17:47:39adminsetnosy: + darcs-devel, - simon
2009-08-27 13:51:37adminsetnosy: tommy, kowey, darcs-devel, thorkilnaur, ben, dmitry.kurochkin