Package: tkcvs Version: 8.1-1 Severity: important I use the "Merge to current" button of the tkcvs tree view to merge changes from one branch to another. After clicking on the button, the "tag and commit" dialog appears. I click "I'm ready" and edit the "merge from" tag to "mergefrom_tkcvs-bug_18Jan10". After clicking on "Ok", I get the cvs output and see that my changes are gone and have been replaced by tkcvs's default:
cvs commit -m "Merge from 1.67.4.2" "make_release" cvs tag -F -r1.67.4.2 mergeto_trunk_18Jan10 "make_release" cvs tag -F mergefrom_branch-0-2-20-Y_18Jan10 "make_release" T make_release I'll try to attache some pictures later. -- System Information: Debian Release: 5.0.3 APT prefers stable APT policy: (500, 'stable') Architecture: i386 (i686) Kernel: Linux 2.6.26-2-686 (SMP w/1 CPU core) Locale: LANG=en_GB.ISO-8859-15, LC_CTYPE=en_GB.ISO-8859-15 (charmap=ISO-8859-15) Shell: /bin/sh linked to /bin/bash Versions of packages tkcvs depends on: ii cvs 1:1.12.13-12 Concurrent Versions System ii subversion 1.5.1dfsg1-4 Advanced version control system ii tk8.5 8.5.3-4 Tk toolkit for Tcl and X11, v8.5 - ii ttf-dejavu 2.25-3 Metapackage to pull in ttf-dejavu- Versions of packages tkcvs recommends: ii aterm [x-terminal-emula 1.0.1-4 Afterstep XVT - a VT102 emulator f ii dirdiff 2.1-4 Display and merge changes between ii eterm [x-terminal-emula 0.9.5-1 Enlightened Terminal Emulator ii gnome-terminal [x-termi 2.22.3-3 The GNOME 2 terminal emulator appl ii konsole [x-terminal-emu 4:3.5.9.dfsg.1-6 X terminal emulator for KDE ii rxvt-ml [x-terminal-emu 1:2.6.4-14 multi-lingual VT102 terminal emula ii rxvt-unicode [x-termina 9.05-1+lenny1 RXVT-like terminal emulator with U ii xterm [x-terminal-emula 235-2 X terminal emulator tkcvs suggests no packages. -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
