2010/8/7 Jérôme Laheurte <[email protected]>: > I'm a bit lost, when trying to merge 1.1 to trunk, I get a conflict on > domain/task/task.py which I can't quite figure out. Could you take a look ?
I don't see a conflict in task.py, but rather in TaskViewerTest.py: $ svn merge https://taskcoach.svn.sourceforge.net/svnroot/taskcoach/branches/Release1_1_Branch/taskcoach --- Merging r3441 through r3464 into 'taskcoachlib/domain/attribute/icon/__init__.py': G taskcoachlib/domain/attribute/icon/__init__.py --- Merging r3441 through r3464 into 'taskcoachlib/domain/attribute/icon': G taskcoachlib/domain/attribute/icon --- Merging r3459 through r3464 into '.': U taskcoachlib/thirdparty/calendar/wxSchedulerPaint.py U taskcoachlib/thirdparty/calendar/wxDrawer.py U taskcoachlib/widgets/calendar.py Conflict discovered in 'tests/unittests/guiTests/TaskViewerTest.py'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p C tests/unittests/guiTests/TaskViewerTest.py U changes.in/changes.py Summary of conflicts: Text conflicts: 1 I'm looking into it. Cheers, Frank PS: What's with the icon/__init__.py file, by the way, do you know? It gets updated on every merge.
