Package: svk Version: 0.30-1 Severity: important
The smerge operation works correctly, but totally ignores the commit message that you give it, and instead uses "1" as the commit message. To attempt to reproduce this problem, do this: ~$ svk mkdir //test1 (empty commit message) ~$ svk cp //test1 //test2 (empty commit message) ~$ svk co //test2 test2 Syncing //test2(/test2) in /home/gldnspud/test2 to 27617. ~$ cd test2 ~/test2$ touch foo ~/test2$ svk add foo A foo ~/test2$ svk commit -m "test commit message" Committed revision 27618. ~/test2$ svk smerge -l //test2 //test1 (leave commit message unchanged, should have "test commit message" in it) Auto-merging (0, 27618) /test2 to /test1 (base /test1:27616). Waiting for editor... Log message not modified: a)bort, e)dit, c)ommit?c A foo New merge ticket: 98aaa396-30ee-0310-86a3-c638dff63dcb:/test2:27618 Committed revision 27619. ~/test2$ svk log //test2 ---------------------------------------------------------------------- r27618: gldnspud | 2005-03-15 18:15:46 -0600 test commit message ---------------------------------------------------------------------- r27617: gldnspud | 2005-03-15 18:15:09 -0600 ---------------------------------------------------------------------- ~/test2$ svk log //test1 ---------------------------------------------------------------------- r27619: gldnspud | 2005-03-15 18:16:10 -0600 1 ---------------------------------------------------------------------- r27616: gldnspud | 2005-03-15 18:14:45 -0600 ---------------------------------------------------------------------- -- System Information: Debian Release: 3.1 APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental') Architecture: i386 (i686) Kernel: Linux 2.6.10-1-686 Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) Versions of packages svk depends on: ii libalgorithm-annotate-perl 0.10-1 represent a series of changes in a ii libalgorithm-diff-perl 1.19.01-1 a perl library for finding Longest ii libclass-autouse-perl 1.17-1 Defer loading ( 'use'ing ) of a cl ii libclone-perl 0.15-1 recursively copy Perl datatypes ii libcompress-zlib-perl 1.34-1 Perl module for creation and manip ii libdata-hierarchy-perl 0.21-1 Handle data in a hierarchical stru ii libfile-type-perl 0.22-1 determine file type using magic st ii libfreezethaw-perl 0.43-2 converting Perl structures to stri ii libio-digest-perl 0.10-1 Calculate digests while reading or ii libio-string-perl 1.05-1 Emulate IO::File interface for in- ii liblocale-maketext-lexicon-pe 0.47-1 Lexicon-handling backends for "Loc ii liblocale-maketext-simple-per 0.12-2 Simple interface to Locale::Makete ii libperlio-eol-perl 0.13-1 PerlIO layer for normalizing line ii libperlio-via-dynamic-perl 0.11-1 dynamic PerlIO layers ii libperlio-via-symlink-perl 0.03-1 PerlIO layers for create symlinks ii libpod-simple-perl 3.02-2 Perl framework for parsing files i ii libregexp-shellish-perl 0.93-1 Shell-like regular expressions ii libsvn-core-perl 1.1.3-2 perl bindings for Subversion (aka. ii libsvn-mirror-perl 0.56-1 A subversion repository mirroring ii libsvn-simple-perl 0.27-1 A simple interface for writing a d ii libtext-diff-perl 0.35-2 Perform diffs on files and record ii libtimedate-perl 1.1600-4 Time and date functions for Perl ii libyaml-perl 0.36-1 YAML Ain't Markup Language (tm) ii perl 5.8.4-8 Larry Wall's Practical Extraction -- no debconf information -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]